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

6
.gitmodules vendored
View file

@ -131,9 +131,9 @@
[submodule "mods/moresnow"]
path = mods/moresnow
url = https://github.com/Sokomine/moresnow
[submodule "mods/boats"]
path = mods/boats
url = https://git.tchncs.de/Illuna-Minetest/boats
[submodule "mods/farming"]
path = mods/farming
url = https://git.tchncs.de/Illuna-Minetest/farming
[submodule "mods/boats"]
path = mods/boats
url = https://git.tchncs.de/Illuna-Minetest/boats