0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finish a word

Browse source
This commit is contained in:
Alexander van Gessel 2012-08-19 21:13:01 +01:00
parent b08206f291
commit a150d38f24
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/tools/wesnoth/libgithub.py
View file

@ -84,7 +84,7 @@ class Addon(object):
elif out.find("CONFLICT") != -1:
#This means that a conflicting local commit was done
#Its author will have to fix it
logging.error("CONFLICT in add-on {0}. Please mer".format(self.name))
logging.error("CONFLICT in add-on {0}. Please merge".format(self.name))
return False
elif err.find("local changes") != -1:
logging.error("Found local changes in add-on {0}.".format(self.name))