# Conflicts: # ICSharpCode.Decompiler/DecompilerSettings.cs # ILSpy/Options/DecompilerSettingsPanel.xaml # ILSpy/Options/DecompilerSettingsPanel.xaml.cs # ILSpy/Properties/AssemblyInfo.template.cs