From 025905a3e4d50b9a2e07fbf4ff0a203af6604ced Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 18 Dec 2016 00:44:21 -0500
Subject: [PATCH] fix merge conflict

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

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 47dd5098a3..0561738e24 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 //[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.0.8500")]
+[assembly: AssemblyVersion("3.1.259")]