wrong merging recovery

This commit is contained in:
2018-07-02 07:40:02 +00:00
parent fca4a82400
commit ffaa1973b1

View File

@@ -1,8 +1 @@
# InterCat
Our entry for the make-zürich 2018 teacher's calling challenge.
Unfortunately we couldn't get as far as we wanted, so there is no documentation or anything usefull for the uninitiated.
If you want more information, please contact me directly.
Maybe we will follow up on the project and add more information, in case someone is interested.
Anyway: all source code is available in the git repository.
The different mesh node types can be checked out from the branches.
# Sprocket-Core