Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mergeconflict in gitmodules

Browse source
This commit is contained in:
tchncs 2016-12-05 21:56:37 +01:00
commit 113984c556
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -128,9 +128,9 @@
[submodule "mods/3d_armor"] [submodule "mods/3d_armor"]
path = mods/3d_armor path = mods/3d_armor
url = https://github.com/stujones11/minetest-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"] [submodule "mods/mods/illuna_ethereal"]
path = mods/mods/illuna_ethereal path = mods/mods/illuna_ethereal
url = https://git.tchncs.de/Illuna-Minetest/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

1
mods/bakedclay

@ -1 +0,0 @@
Subproject commit b6347c81ecc4864010f2f9ea8ae0c420f7a6c40d

1
mods/chat_bubbles Submodule

@ -0,0 +1 @@
Subproject commit 48fb8b16b297d3742205ad8f430d8eb8b39cee8d