From 21a8dc77c322949339562526d6acbd02f9ece32f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 28 Aug 2016 15:45:17 -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 3a703bb6f..ded2038b0 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.1.126")]
+[assembly: AssemblyVersion("3.1.*")]
+//[assembly: AssemblyVersion("3.0.6060")]