Compare commits
No commits in common. "352af1125dc7d50af7e08d7164b4d61c7ca0cd4c" and "8dc04b907c0746fc641b83da194e74d383cdd59f" have entirely different histories.
352af1125d
...
8dc04b907c
@ -1,10 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Scenes/BoundaryLightBaking.meta
|
||||
guid: e3e79963f57f4e64aa59d39becffb9ba
|
||||
folderAsset: yes
|
||||
========
|
||||
guid: f1789757845b0c2448706817ae465dd7
|
||||
>>>>>>>> fa681c2cbb63d92fd4c361bb18fcb9282169487e:Assets/Scenes/KWE 1.unity.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
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