diff options
| author | Mirta <mirta@twine-s.com> | 2020-08-19 10:33:15 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2020-08-19 10:33:15 +0300 |
| commit | e3bc7c2268cb25464d62dd56c7c265826c57d3c0 (patch) | |
| tree | 59ff75312959109f826bf70f2e7e82e689bba1fd /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer | |
| parent | 7b6a64613bc18b1ce6c92fa9c335684ebaf00c90 (diff) | |
| parent | 4702a085323fc2a6b403187867f9bf8c66bf45f6 (diff) | |
| download | Tango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.tar.gz Tango-e3bc7c2268cb25464d62dd56c7c265826c57d3c0.zip | |
resolved conflicts
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 5b29fd432..073ba827f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -756,7 +756,7 @@ <StackPanel> <TextBlock>MEDIA</TextBlock> <StackPanel Orientation="Horizontal" DockPanel.Dock="Left"> - <controls:SearchComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" HorizontalContentAlignment="Stretch" SearchParam="Name"> + <controls:SearchComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" HorizontalContentAlignment="Stretch" SearchProperty="Name"> <ComboBox.ItemTemplate> <DataTemplate> <DockPanel> |