diff options
| author | chai <chaifix@163.com> | 2020-11-20 21:12:42 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2020-11-20 21:12:42 +0800 |
| commit | 152c56a5b706a22993388786586cb4ee3b423577 (patch) | |
| tree | d2e14e3e151160238abb8e6fcbfe800580ad5388 /Assets/Art/Models/Characters/Robots_Prowler.meta | |
| parent | 7c06559f1e8949d1ceed4cb3474c272ae0e1a27b (diff) | |
| parent | 53ff454d20a1480069f5cde82b525c82c47d1362 (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/Erika
# Conflicts:
# Assets/Art/Models/Characters/Robots_Prowler.meta
# Assets/Art/Models/Characters/Robots_Prowler/Materials.meta
# Assets/Art/Models/Characters/Robots_Prowler/prefab.meta
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 946eb435..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: {} |