合并后处理冲突

Assets/Scripts/ConfigHelper.cs

@@ -18,7 +18,6 @@ namespace Assets.Scripts
         public static UserApi userApi = new UserApi();
         public static MapApi mapApi = new MapApi();
         public static MapInterruptRecordApi mapInterruptRecordApi = new MapInterruptRecordApi();
-        public static string AppVersion = "1.0.0";
 
         public static IPEndPoint UdpAddress ;
 

Assets/Scripts/UI.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d0341abab3ca8db49b556a2b5cb0465b
+guid: 39a2553da07e5664a998dcde082ea86b
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/Utils.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6ff97914c4666344b99b4484a6e295c1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: