fix mergeconflict in gitmodules

2016-12-05 21:56:37 +01:00 · 2016-12-05 21:56:37 +01:00 · 113984c556
commit 113984c556
parent 43996e32e6 2791afcd2a
3 changed files with 4 additions and 4 deletions
--- a/mods/bakedclay
+++ b/mods/bakedclay
@ -1 +0,0 @@
-Subproject commit b6347c81ecc4864010f2f9ea8ae0c420f7a6c40d
--- a/mods/chat_bubbles
+++ b/mods/chat_bubbles
@ -0,0 +1 @@
+Subproject commit 48fb8b16b297d3742205ad8f430d8eb8b39cee8d
				`@ -1 +0,0 @@`
				`Subproject commit b6347c81ecc4864010f2f9ea8ae0c420f7a6c40d`
				`@ -0,0 +1 @@`
				`Subproject commit 48fb8b16b297d3742205ad8f430d8eb8b39cee8d`