pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix merge errors

pull/3302/head
tom-englert 1 year ago
parent
47d52fcacf
commit
d1198287e8
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ILSpy/MainWindow.xaml

2
ILSpy/MainWindow.xaml
Unescape View File

@ -146,7 +146,7 @@
</CheckBox> </CheckBox>
<Separator /> <Separator />
<Grid Margin="2,0"> <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" <ComboBox Name="languageComboBox" DisplayMemberPath="Name" MaxDropDownHeight="Auto"
IsEnabled="{Binding Workspace.ActiveTabPage.SupportsLanguageSwitching}" IsEnabled="{Binding Workspace.ActiveTabPage.SupportsLanguageSwitching}"
ItemsSource="{Binding LanguageService.AllLanguages}" ItemsSource="{Binding LanguageService.AllLanguages}"

Write Preview
Loading…
Cancel
Save