Revert "Merge branch 'leveldesign_r'"

This reverts commit 998a52fe3c.
This commit is contained in:
Jan Groß
2018-09-08 17:44:36 +02:00
parent 998a52fe3c
commit c64220a353
209 changed files with 274 additions and 59813 deletions

View File

@@ -1,26 +1,16 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 743de541888a4014c912500b676649b4
=======
guid: 743de541888a4014c912500b676649b4
>>>>>>> leveldesign_r
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
<<<<<<< HEAD
2100000: Rock
2100002: Top
=======
2100000: Material
2100002: Rock
2100004: Top
>>>>>>> leveldesign_r
2300000: //RootNode
3300000: //RootNode
4300000: Cube