Revert "Merge branch 'leveldesign_r'"

This reverts commit 998a52fe3c.
2018-09-08 17:44:36 +02:00
parent 998a52fe3c
commit c64220a353
209 changed files with 274 additions and 59813 deletions
--- a/Assets/Blender/rock_wall_edge.blend.meta
+++ b/Assets/Blender/rock_wall_edge.blend.meta
@@ -1,10 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: a407b81221217314cb2f3f58d53416b6
-=======
-guid: 9ce16e413ddf64b45b624f04e77768ab
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -14,11 +10,7 @@ ModelImporter:
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
-<<<<<<< HEAD

-=======
-    6400000: //RootNode
->>>>>>> leveldesign_r
    7400000: Default Take
    9500000: //RootNode
  externalObjects: {}
@@ -55,10 +47,7 @@ ModelImporter:
    globalScale: 1
    meshCompression: 0
    addColliders: 1
-<<<<<<< HEAD

-=======
->>>>>>> leveldesign_r
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1