fix mergeconflicts

readd submodule boats+farming

fix mergeconflicts
c74b9c96 · Milan · 90ad2b66 · c74b9c96 · 8638435b · 8638435b
Commit c74b9c96 authored 8 years ago by Milan
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
--- a/homedecor_modpack @ 8638435b
+++ b/homedecor_modpack @ 8638435b
-Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828
--- a/irc @ 18f286f4
+++ b/irc @ 18f286f4
-Subproject commit 18f286f4b51ecdffa3744c96b2223912d8e812cf