fix mergeconflict in gitmodules
This commit is contained in:
commit
113984c556
3 changed files with 4 additions and 4 deletions
6
.gitmodules
vendored
6
.gitmodules
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue