TagManager fix

latarm · Apr 22, 2020 · a79f165 · a79f165
1 parent 67376c7
commit a79f165
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
@@ -18,13 +18,10 @@ TagManager:
   - UI Canvas
   - TestTag
   - Manager
-<<<<<<< HEAD
   - Spawner
   - PatrolWaypointsForest
-=======
   - Rabbit
   - Sphere
->>>>>>> Code/rina-marina/rabbit-ai
   layers:
   - Default
   - TransparentFX