From 08830afea98bbf79d297a1b5b06c1710c2c7dfee Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Sun, 28 Apr 2019 00:30:04 +0200
Subject: [PATCH] Update... something?

---
 Assets/Prefabs/Slime.prefab | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Assets/Prefabs/Slime.prefab b/Assets/Prefabs/Slime.prefab
index 7faae72..30a9177 100644
--- a/Assets/Prefabs/Slime.prefab
+++ b/Assets/Prefabs/Slime.prefab
@@ -46,13 +46,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   hpMax: 0
   hp: 0
-<<<<<<< Updated upstream
   sprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3}
   visionRange: 4
-=======
-  sprite: {fileID: 21300000, guid: 0121970e693ee0a4d987bd5fe694ad67, type: 3}
-  visionRange: 2.5
->>>>>>> Stashed changes
 --- !u!212 &1351652798109185028
 SpriteRenderer:
   m_ObjectHideFlags: 0