Resolve merge issues

realitycollective · May 6, 2024 · 21d477d · 21d477d
1 parent 8bf0061
commit 21d477d
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 118 deletions.
diff --git a/Editor/AssemblyInfo.cs b/Editor/AssemblyInfo.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.0.11")]
+[assembly: AssemblyVersion("1.0.12")]
 [assembly: AssemblyTitle("com.realitycollective.utilities.editor")]
 [assembly: AssemblyCompany("Reality Collective")]
 [assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Editor/RealityCollective.Utilities.Editor.asmdef b/Editor/RealityCollective.Utilities.Editor.asmdef
@@ -2,8 +2,7 @@
     "name": "RealityCollective.Utilities.Editor",
     "rootNamespace": "RealityCollective.Utilities.Editor",
     "references": [
-        "GUID:b2d046948d6452a4b8485efc9ce0f88c",
-        "GUID:84651a3751eca9349aac36a66bba901b"
+        "GUID:b2d046948d6452a4b8485efc9ce0f88c"
     ],
     "includePlatforms": [
         "Editor"

diff --git a/Editor/Utilities/AssemblyDefinitionPostprocessor.cs b/Editor/Utilities/AssemblyDefinitionPostprocessor.cs
diff --git a/Editor/Utilities/AssemblyDefinitionPostprocessor.cs.meta b/Editor/Utilities/AssemblyDefinitionPostprocessor.cs.meta
diff --git a/Runtime/AssemblyInfo.cs b/Runtime/AssemblyInfo.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.0.11")]
+[assembly: AssemblyVersion("1.0.12")]
 [assembly: AssemblyTitle("com.realitycollective.utilities")]
 [assembly: AssemblyCompany("Reality Collective")]
 [assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/Runtime/RealityCollective.Utilities.asmdef b/Runtime/RealityCollective.Utilities.asmdef
@@ -2,8 +2,7 @@
     "name": "RealityCollective.Utilities",
     "rootNamespace": "RealityCollective.Utilities",
     "references": [
-        "GUID:478a2357cc57436488a56e564b08d223",
-        "GUID:84651a3751eca9349aac36a66bba901b"
+        "GUID:478a2357cc57436488a56e564b08d223"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/Tests/AssemblyInfo.cs b/Tests/AssemblyInfo.cs
@@ -3,7 +3,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.0.11")]
+[assembly: AssemblyVersion("1.0.12")]
 [assembly: AssemblyTitle("com.realitycollective.utilities.tests")]
 [assembly: AssemblyCompany("Reality Collective")]
 [assembly: AssemblyCopyright("Copyright (c) Reality Collective. All rights reserved.")]
diff --git a/package.json b/package.json
@@ -32,7 +32,6 @@
   },
   "dependencies": {
     "com.unity.modules.unitywebrequest": "1.0.0",
-    "com.unity.editorcoroutines": "1.0.0",
-    "com.unity.addressables": "1.18.15"
+    "com.unity.editorcoroutines": "1.0.0"
   }
-}
+}