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

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index ab067b03..4737a5d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 StardewModdingAPI/bin/
 StardewModdingAPI/obj/
 packages/
-StardewInjector/
 
 *.symlink
 *.lnk
-- 
cgit