998a52fe3c
# Conflicts: # Assets/Blender/longplateau_horizontal.blend.meta # Assets/Blender/rock_wall_edge.blend.meta # Assets/Blender/rock_wall_ridge.blend.meta # Assets/Blender/rock_wall_stepped.blend.meta # Assets/Blender/rocks01.blend.meta # Assets/Blender/spikertap1.blend.meta # Assets/Blender/tree_platform.blend.meta # Assets/Blender/tree_tops.blend.meta # Assets/Blender/trees_with_trunks.blend.meta # Assets/Blender/waves.blend.meta # Assets/Materials/Sprites.meta # Assets/Scenes/Level_Cave.unity
13 lines
254 B
Plaintext
13 lines
254 B
Plaintext
fileFormatVersion: 2
|
|
<<<<<<< HEAD
|
|
guid: 6f398163076650348a3d756390fbcdf4
|
|
=======
|
|
guid: a83b06f29e3a1554b9b2fe697047e32f
|
|
>>>>>>> leveldesign_r
|
|
folderAsset: yes
|
|
DefaultImporter:
|
|
externalObjects: {}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|