diff options
Diffstat (limited to 'Assets/Art/Models/Characters/Robots_Prowler/prefab.meta')
| -rw-r--r-- | Assets/Art/Models/Characters/Robots_Prowler/prefab.meta | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta b/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta index d4d31fed..8347b80b 100644 --- a/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta +++ b/Assets/Art/Models/Characters/Robots_Prowler/prefab.meta @@ -1,5 +1,9 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 827f8d429ded36b4c8d57cfe7f758f11 +======= +guid: 18666271c928a9d4e9137c3fecec80e8 +>>>>>>> 53ff454d20a1480069f5cde82b525c82c47d1362 folderAsset: yes DefaultImporter: externalObjects: {} |