GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-06-23 04:42:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict error

Browse Source
This commit is contained in:
Blake Grotewold
2016-03-19 15:17:32 -04:00
parent 9438d2c30b
commit 0fbb713e17
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/events.js
+1
View File
@@ -519,6 +519,7 @@ var Events = {
} }
}); });
} }
},
endFight: function() { endFight: function() {
Events.fought = true; Events.fought = true;