From c74b9c968df8b4fa9d863e8d1388ac70ea572735 Mon Sep 17 00:00:00 2001
From: Milan* <tchncs@vivaldi.net>
Date: Thu, 15 Dec 2016 18:51:42 +0000
Subject: [PATCH] fix mergeconflicts readd submodule boats+farming

---
 .gitmodules            | 6 +++---
 mods/homedecor_modpack | 1 -
 mods/irc               | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 160000 mods/homedecor_modpack
 delete mode 160000 mods/irc

diff --git a/.gitmodules b/.gitmodules
index 5bbf8230..4f192530 100644
--- 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
diff --git a/mods/homedecor_modpack b/mods/homedecor_modpack
deleted file mode 160000
index 8638435b..00000000
--- a/mods/homedecor_modpack
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828
diff --git a/mods/irc b/mods/irc
deleted file mode 160000
index 18f286f4..00000000
--- a/mods/irc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 18f286f4b51ecdffa3744c96b2223912d8e812cf
-- 
GitLab