Post apocalypse fixes

src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj

@@ -58,11 +58,6 @@
     </ItemGroup>
   
     <ItemGroup>
-<<<<<<< HEAD
-      <ProjectReference Include="..\PixiEditor.Extensions.CommonApi.Diagnostics\PixiEditor.Extensions.CommonApi.Diagnostics.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    </ItemGroup>
-  
-=======
       <PackageReference Include="protobuf-net" Version="3.2.30" />
     </ItemGroup>
   
@@ -104,6 +99,4 @@
     </ItemGroup>
 
   </Target>
-
->>>>>>> refs/heads/avalonia-rewrite
 </Project>

src/PixiEditor.Extensions.CommonApi/UserPreferences/Settings/Setting.cs

@@ -64,7 +64,7 @@ public abstract class Setting<T> : INotifyPropertyChanged
 
     protected abstract void SetValue(IPreferences preferences, T? value);
 
-    private void SettingChangeCallback(T newValue)
+    private void SettingChangeCallback(string name, T newValue)
     {
         ValueChanged?.Invoke(this, newValue);
         PropertyChanged?.Invoke(this, PropertyChangedConstants.ValueChangedPropertyArgs);