Compare commits
3 Commits
8dc04b907c
...
352af1125d
Author | SHA1 | Date | |
---|---|---|---|
![]() |
352af1125d | ||
![]() |
7734183502 | ||
![]() |
ee16d8f094 |
@ -1,6 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Scenes/BoundaryLightBaking.meta
|
||||
guid: e3e79963f57f4e64aa59d39becffb9ba
|
||||
folderAsset: yes
|
||||
========
|
||||
guid: f1789757845b0c2448706817ae465dd7
|
||||
>>>>>>>> fa681c2cbb63d92fd4c361bb18fcb9282169487e:Assets/Scenes/KWE 1.unity.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
@ -1,5 +1,10 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Scenes/BoundaryLightBaking.meta
|
||||
guid: e3e79963f57f4e64aa59d39becffb9ba
|
||||
folderAsset: yes
|
||||
========
|
||||
guid: f1789757845b0c2448706817ae465dd7
|
||||
>>>>>>>> fa681c2cbb63d92fd4c361bb18fcb9282169487e:Assets/Scenes/KWE 1.unity.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
Loading…
x
Reference in New Issue
Block a user