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