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