diff options
Diffstat (limited to 'Assets/Art/Models/Characters/Robots_Prowler')
| -rw-r--r-- | Assets/Art/Models/Characters/Robots_Prowler/Materials.meta | 4 | ||||
| -rw-r--r-- | Assets/Art/Models/Characters/Robots_Prowler/prefab.meta | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/Assets/Art/Models/Characters/Robots_Prowler/Materials.meta b/Assets/Art/Models/Characters/Robots_Prowler/Materials.meta index 2c16c2e4..3c098725 100644 --- a/Assets/Art/Models/Characters/Robots_Prowler/Materials.meta +++ b/Assets/Art/Models/Characters/Robots_Prowler/Materials.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<< HEAD guid: d9a811dd9a4831848b8aba41aeef0310 -======= -guid: cec26bf158a0c9647842c35124262c27 ->>>>>>> 53ff454d20a1480069f5cde82b525c82c47d1362 folderAsset: yes DefaultImporter: externalObjects: {} 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: {} |