From 9a1b910ea32f518b605c88315f192afc6fc40f28 Mon Sep 17 00:00:00 2001 From: Zoryn Date: Thu, 3 Mar 2016 15:06:25 -0500 Subject: resync for merge conflicts --- Release/Mods/TrainerMod.dll | Bin 23552 -> 24064 bytes Release/StardewModdingAPI.exe | Bin 69120 -> 72704 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'Release') diff --git a/Release/Mods/TrainerMod.dll b/Release/Mods/TrainerMod.dll index bcf663ab..d39f4375 100644 Binary files a/Release/Mods/TrainerMod.dll and b/Release/Mods/TrainerMod.dll differ diff --git a/Release/StardewModdingAPI.exe b/Release/StardewModdingAPI.exe index 5c6d556b..c4813237 100644 Binary files a/Release/StardewModdingAPI.exe and b/Release/StardewModdingAPI.exe differ -- cgit