From 9a1b910ea32f518b605c88315f192afc6fc40f28 Mon Sep 17 00:00:00 2001
From: Zoryn <zoryn4163@gmail.com>
Date: Thu, 3 Mar 2016 15:06:25 -0500
Subject: resync for merge conflicts

---
 TrainerMod/TrainerMod.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'TrainerMod/TrainerMod.cs')

diff --git a/TrainerMod/TrainerMod.cs b/TrainerMod/TrainerMod.cs
index aea740c4..cc6f2044 100644
--- a/TrainerMod/TrainerMod.cs
+++ b/TrainerMod/TrainerMod.cs
@@ -38,7 +38,7 @@ namespace TrainerMod
         public static int frozenTime;
         public static bool infHealth, infStamina, infMoney, freezeTime;
 
-        public override void Entry()
+        public override void Entry(params object[] objects)
         {
             RegisterCommands();
             Events.UpdateTick += Events_UpdateTick;
-- 
cgit