Fix conflict

This commit is contained in:
Angelo Salese 2014-06-05 15:39:27 +00:00
parent 6ef7f9fb74
commit 9b7e7b430f

View file

@ -31628,4 +31628,3 @@ fireball
amusco // 1987, Amusco.
cocoloco // 198?, Petaco S.A.
crazybon