From a79f165b0e02bbbfc8a0e029370c32b35cd9a288 Mon Sep 17 00:00:00 2001
From: latarm <titonko@list.ru>
Date: Wed, 22 Apr 2020 05:53:23 +0300
Subject: [PATCH] TagManager fix

---
 ProjectSettings/TagManager.asset | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 4170fbc6a..9e05ca564 100644
--- 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