fix merge conflict error

This commit is contained in:
Blake Grotewold
2016-03-19 15:17:32 -04:00
parent 9438d2c30b
commit 0fbb713e17
+1
View File
@@ -519,6 +519,7 @@ var Events = {
}
});
}
},
endFight: function() {
Events.fought = true;