mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
281a26b979
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com> Conflicts: code/modules/mob/living/silicon/robot/robot_modules.dm
10 lines
241 B
Bash
Executable File
10 lines
241 B
Bash
Executable File
java -jar tools/mapmerge/MapPatcher.jar -merge $1 $2 $3 $2
|
|
if [ "$?" -gt 0 ]
|
|
then
|
|
echo "Unable to automatically resolve map conflicts, please merge manually."
|
|
exit 1
|
|
fi
|
|
java -jar tools/mapmerge/MapPatcher.jar -clean $1 $2 $2
|
|
|
|
exit 0
|