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/rocks01.blend.meta
+++ b/Assets/Blender/rocks01.blend.meta
@@ -65,10 +65,7 @@ ModelImporter:
    7400000: Default Take
    9500000: //RootNode
    2186277476908879412: ImportLogs
-<<<<<<< HEAD

-=======
->>>>>>> leveldesign_r
  externalObjects: {}
  materials:
    importMaterials: 1