fix mergeconflicts

readd submodule boats+farming
This commit is contained in:
Milan* 2016-12-15 18:51:42 +00:00
parent 90ad2b6689
commit c74b9c968d
3 changed files with 3 additions and 5 deletions

@ -1 +0,0 @@
Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828

@ -1 +0,0 @@
Subproject commit 18f286f4b51ecdffa3744c96b2223912d8e812cf