fix mergeconflict in gitmodules

113984c5 · Milan · 43996e32 · 2791afcd · 113984c5 · b6347c81
Commit 113984c5 authored 8 years ago by Milan
--- a/.gitmodules
+++ b/.gitmodules
@@ -128,9 +128,9 @@
 [submodule "mods/3d_armor"]
 	path = mods/3d_armor
 	url = https://github.com/stujones11/minetest-3d_armor
-[submodule "mods/bakedclay"]
-	path = mods/bakedclay
-	url = https://github.com/tenplus1/bakedclay
 [submodule "mods/mods/illuna_ethereal"]
 	path = mods/mods/illuna_ethereal
 	url = https://git.tchncs.de/Illuna-Minetest/illuna_ethereal
+[submodule "mods/chat_bubbles"]
+	path = mods/chat_bubbles
+	url = https://github.com/jordan4ibanez/Chat-Bubbles
--- a/bakedclay @ b6347c81
+++ b/bakedclay @ b6347c81
-Subproject commit b6347c81ecc4864010f2f9ea8ae0c420f7a6c40d
--- a/chat_bubbles @ 48fb8b16
+++ b/chat_bubbles @ 48fb8b16
+Subproject commit 48fb8b16b297d3742205ad8f430d8eb8b39cee8d