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,11 +1,7 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: e19e7453725b19e4e989432893eb38d1
=======
guid: e19e7453725b19e4e989432893eb38d1
>>>>>>> leveldesign_r
ModelImporter:
serializedVersion: 23
fileIDToRecycleName: