chore: Adjust after backport

Author: jeromelaban

src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Mobile/macOS/Main.macOS.cs

@@ -8,13 +8,8 @@ public class EntryPoint
 		static void Main(string[] args)
 		{
 			NSApplication.Init();
-<<<<<<< HEAD
-			NSApplication.SharedApplication.Delegate = new App();
-			NSApplication.Main(args);  
-=======
 			NSApplication.SharedApplication.Delegate = new AppHead();
 			NSApplication.Main(args);
->>>>>>> a27ca7001c (chore: Adjust AppHead references)
 		}
 	}
 }

src/SolutionTemplate/UnoSolutionTemplate.WinUI.netcore/Skia.WPF/Wpf/MainWindow.xaml.cs

@@ -23,13 +23,8 @@ public partial class MainWindow : Window
 		public MainWindow()
 		{
 			InitializeComponent();
-<<<<<<< HEAD
-	
-			root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new $ext_safeprojectname$.App());
-=======
 
 			root.Content = new global::Uno.UI.Skia.Platform.WpfHost(Dispatcher, () => new $ext_safeprojectname$.AppHead());
->>>>>>> a27ca7001c (chore: Adjust AppHead references)
 		}
 	}
 }