Conflict changes.

Author: Matthew Bate

BHD-ServerManager/Classes/CoreObjects/CommonCore.cs

@@ -1,5 +1,6 @@
-using BHD_ServerManager.Classes.Instances;
-using BHD_ServerManager.Classes.SupportClasses;
+using BHD_ServerManager.Classes.SupportClasses;
+using HawkSyncShared.Instances;
+using HawkSyncShared.SupportClasses;
 using System;
 using System.IO;
 

BHD-ServerManager/Classes/Instances/theInstance.cs

@@ -1,5 +1,5 @@
 using BHD_ServerManager.Classes.InstanceManagers;
-using BHD_ServerManager.Classes.ObjectClasses;
+using HawkSyncShared.Instances;
 using BHD_ServerManager.Classes.SupportClasses;
 using System;
 using System.Collections.Generic;

HawkSyncShared/Instances/mapInstance.cs

@@ -1,15 +1,8 @@
-<<<<<<< HEAD:HawkSyncShared/Instances/mapInstance.cs
 using HawkSyncShared.ObjectClasses;
 using HawkSyncShared.Instances;
 using System.Collections.Generic;
 
 namespace HawkSyncShared.Instances;
-=======
-using BHD_ServerManager.Classes.ObjectClasses;
-using System.Collections.Generic;
-
-namespace BHD_ServerManager.Classes.Instances;
->>>>>>> ed4f84426d6449f979e54b6025b7ef785c7a674e:BHD-ServerManager/Classes/Instances/mapInstance.cs
 
 /// <summary>
 /// Contains all map-related data for map management and playlists