Browse Source

Fix merge errors

pull/3302/head
tom-englert 10 months ago
parent
commit
d1198287e8
  1. 2
      ILSpy/MainWindow.xaml

2
ILSpy/MainWindow.xaml

@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
</CheckBox>
<Separator />
<Grid Margin="2,0">
<ItemsControl ItemsSource="{x:Static local:Languages.AllLanguages}" DisplayMemberPath="Name" Height="0" Margin="15,0" />
<ItemsControl ItemsSource="{Binding LanguageService.AllLanguages}" DisplayMemberPath="Name" Height="0" Margin="15,0" />
<ComboBox Name="languageComboBox" DisplayMemberPath="Name" MaxDropDownHeight="Auto"
IsEnabled="{Binding Workspace.ActiveTabPage.SupportsLanguageSwitching}"
ItemsSource="{Binding LanguageService.AllLanguages}"

Loading…
Cancel
Save