fix merge issues

stilnat · Nov 23, 2023 · 193ce48 · 193ce48
1 parent 5f15462
commit 193ce48
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/Assets/Content/Data/Items.asset b/Assets/Content/Data/Items.asset
@@ -60,9 +60,6 @@ MonoBehaviour:
   - {fileID: 726792282085660869, guid: 4635651592391df41b6b2413afdb76c3, type: 3}
   - {fileID: 7723921361698481624, guid: f549f4153ef612c4586c46ea280e0e94, type: 3}
   - {fileID: 8712940276313799639, guid: 1a2f912be4bc1b948a2b22ffde517cdc, type: 3}
-<<<<<<< Updated upstream
-  - {fileID: 1080889307602868191, guid: 8fabaf8ecfcd66a43a5b3fe2cefea719, type: 3}
-=======
   - {fileID: 1888615333292121711, guid: 06b6be83779804245b7f6411fe07b851, type: 3}
   - {fileID: 832941577213411195, guid: 432a4ad70e41e5c4f8f913f76fe0e66c, type: 3}
   - {fileID: 3861326785315191697, guid: e02f11b9239b52748a5ed5afd1c5cbd3, type: 3}
@@ -83,4 +80,3 @@ MonoBehaviour:
   - {fileID: 5774385816057912484, guid: 1e304f9a331c2ba419514ef8afb8a13c, type: 3}
   - {fileID: 5774385816057912484, guid: 071581df025e1ba49a8a75eb39611ff6, type: 3}
   - {fileID: 5774385816057912484, guid: 7579883b8dd8801448a176adace4860b, type: 3}
->>>>>>> Stashed changes
diff --git a/Assets/Scripts/SS3D/Data/Enums/ItemId.cs b/Assets/Scripts/SS3D/Data/Enums/ItemId.cs
@@ -1,4 +1,4 @@
-namespace SS3D.Data.Enums
+namespace SS3D.Data.Enums
 {
     public enum ItemId
     {
@@ -46,9 +46,6 @@ public enum ItemId
         JumpsuitSecurity = 41, 
         HeadsetLeft = 42, 
         HeadsetRight = 43, 
-<<<<<<< Updated upstream
-        Toolbelt = 44, 
-=======
         HumanArmLeft = 44, 
         HumanArmRight = 45, 
         HumanEarLeft = 46, 
@@ -69,7 +66,6 @@ public enum ItemId
         HumanIntestineLarge = 61, 
         HumanEye = 62, 
         HumanBrain = 63, 
->>>>>>> Stashed changes
     }
 }