From 8fdd3f40e582e47fdd8b8e2feaf190cdf5b0c8fa Mon Sep 17 00:00:00 2001
From: tchncs <me@tchncs.de>
Date: Mon, 14 Nov 2016 11:47:09 +0100
Subject: [PATCH] fix stupid cherry-pick conflict

---
 .gitmodules | 27 +++++++++++++++++++++++++++
 mods/golems |  1 +
 2 files changed, 28 insertions(+)
 create mode 160000 mods/golems

diff --git a/.gitmodules b/.gitmodules
index 9eb607c9..81bb16b4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -98,9 +98,36 @@
 [submodule "mods/mobs_monster"]
 	path = mods/mobs_monster
 	url = https://git.tchncs.de/Illuna-Minetest/mobs_monster
+<<<<<<< HEAD
 [submodule "mods/ranks"]
 	path = mods/ranks
 	url = https://git.tchncs.de/Illuna-Minetest/ranks
 [submodule "mods/another_charcoal"]
 	path = mods/another_charcoal
 	url = https://github.com/cx384/another_charcoal
+=======
+[submodule "mods/protector"]
+	path = mods/protector
+	url = https://github.com/tenplus1/protector
+[submodule "mods/irc"]
+	path = mods/irc
+	url = https://github.com/minetest-mods/irc
+[submodule "mods/ethereal"]
+	path = mods/ethereal
+	url = https://git.tchncs.de/Illuna-Minetest/ethereal
+[submodule "mods/technic"]
+	path = mods/technic
+	url = https://git.tchncs.de/Illuna-Minetest/technic
+[submodule "mods/markers"]
+	path = mods/markers
+	url = https://github.com/Sokomine/markers
+[submodule "mods/areas"]
+	path = mods/areas
+	url = https://github.com/ShadowNinja/areas
+[submodule "mods/pipeworks"]
+	path = mods/pipeworks
+	url = https://github.com/minetest-mods/pipeworks/
+[submodule "mods/golems"]
+	path = mods/golems
+	url = https://git.tchncs.de/Illuna-Minetest/golems
+>>>>>>> d8502f7... add submodule golems
diff --git a/mods/golems b/mods/golems
new file mode 160000
index 00000000..b39a9c79
--- /dev/null
+++ b/mods/golems
@@ -0,0 +1 @@
+Subproject commit b39a9c79f7d3cb40d285a0d9c496b1b5d62f6cad