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

fix mergeconflict

Browse source
This commit is contained in:
tchncs 2018-11-29 12:38:43 +01:00
commit 03cde3f325
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -65,9 +65,6 @@
[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/
@ -230,3 +227,6 @@
[submodule "mods/illuna_costumes"]
path = mods/illuna_costumes
url = https://git.tchncs.de/Illuna-Minetest/illuna_costumes
[submodule "mods/areas"]
path = mods/areas
url = https://git.tchncs.de/Illuna-Minetest/areas