mirror of
https://github.com/doublespeakgames/adarkroom.git
synced 2026-05-28 00:01:54 +08:00
fix merge conflict error
This commit is contained in:
@@ -519,6 +519,7 @@ var Events = {
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
endFight: function() {
|
||||
Events.fought = true;
|
||||
|
||||
Reference in New Issue
Block a user