From d1198287e87601d84165cab9dcc04baa087b5a8b Mon Sep 17 00:00:00 2001
From: tom-englert <mail@tom-englert.de>
Date: Sat, 19 Oct 2024 16:53:59 +0200
Subject: [PATCH] Fix merge errors

---
 ILSpy/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ILSpy/MainWindow.xaml b/ILSpy/MainWindow.xaml
index 2b0064d696..bbefc63fc1 100644
--- a/ILSpy/MainWindow.xaml
+++ b/ILSpy/MainWindow.xaml
@@ -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}"