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 | |
| 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')
| -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, 8 insertions, 0 deletions
diff --git a/Assets/Art/Models/Characters/Robots_Prowler/Materials.meta b/Assets/Art/Models/Characters/Robots_Prowler/Materials.meta index 3c098725..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: {} 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: {} |