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

---
 StardewInjector/Program.cs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 StardewInjector/Program.cs

(limited to 'StardewInjector/Program.cs')

diff --git a/StardewInjector/Program.cs b/StardewInjector/Program.cs
new file mode 100644
index 00000000..41c72240
--- /dev/null
+++ b/StardewInjector/Program.cs
@@ -0,0 +1,30 @@
+/*
+using Mono.Cecil;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Stardew_Injector
+{
+    class Program
+    {
+
+        private static Stardew_Hooker hooker = new Stardew_Hooker();
+
+        static void Main(string[] args)
+        {
+            hooker.Initialize();
+            hooker.ApplyHooks();
+            hooker.Finalize();
+         
+            hooker.Run();
+            Console.ReadLine();
+        }
+
+    }
+}
+*/
\ No newline at end of file
-- 
cgit