From 8cca5dfb03d126b87b007e4699b061433991d3ae Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 5 Aug 2016 02:13:19 -0400
Subject: [PATCH] fix merge conflict

---
 SharedVersion.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SharedVersion.cs b/SharedVersion.cs
index d852537b24..8de20ebed3 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.1.89")]
+[assembly: AssemblyVersion("3.1.*")]
+//[assembly: AssemblyVersion("3.1.80")]