mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
9 lines
191 B
Bash
9 lines
191 B
Bash
java -jar tools/dmitool/dmitool.jar merge $1 $2 $3 $2
|
|
if [ "$?" -gt 0 ]
|
|
then
|
|
echo "Unable to automatically resolve all icon_state conflicts, please merge manually."
|
|
exit 1
|
|
fi
|
|
|
|
exit 0
|