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/bin/Debug/StardewInjector.dll.config | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 StardewInjector/bin/Debug/StardewInjector.dll.config

(limited to 'StardewInjector/bin/Debug/StardewInjector.dll.config')

diff --git a/StardewInjector/bin/Debug/StardewInjector.dll.config b/StardewInjector/bin/Debug/StardewInjector.dll.config
new file mode 100644
index 00000000..f1914205
--- /dev/null
+++ b/StardewInjector/bin/Debug/StardewInjector.dll.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="RunSpeed" value="0"/>
+    <add key="EnableTweakedDiagonalMovement" value="False"/>
+    <add key="EnableEasyFishing" value="False"/>
+    <add key="EnableAlwaysSpawnFishingBubble" value="False"/>
+    <add key="SecondsPerTenMinutes" value="7"/>
+    <add key="EnableDebugMode" value="False"/>
+
+  </appSettings>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    </startup>
+</configuration>
-- 
cgit