From bc4d5201fc537f70cdcb576b57aaeb5d96527112 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Mon, 23 Nov 2020 21:05:39 +0800
Subject: *misc

---
 Assets/Art/Models/Characters/Robots_Prowler/prefab.meta | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'Assets/Art/Models/Characters/Robots_Prowler/prefab.meta')

diff --git a/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta b/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta
index 8347b80b..d4d31fed 100644
--- a/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta
+++ b/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: 827f8d429ded36b4c8d57cfe7f758f11
-=======
-guid: 18666271c928a9d4e9137c3fecec80e8
->>>>>>> 53ff454d20a1480069f5cde82b525c82c47d1362
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
-- 
cgit v1.1-26-g67d0