From 0fbb713e17e75ce60b05562dd2f26901053c8b78 Mon Sep 17 00:00:00 2001
From: Blake Grotewold <blake.grotewold@gmail.com>
Date: Sat, 19 Mar 2016 15:17:32 -0400
Subject: [PATCH] fix merge conflict error

---
 script/events.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/events.js b/script/events.js
index da034aec4..c75a0b8e5 100644
--- a/script/events.js
+++ b/script/events.js
@@ -519,6 +519,7 @@ var Events = {
 					}
 			});
 		}
+    },
 
 	endFight: function() {
 		Events.fought = true;