From 7dca92f8a0ca2773a6b86cb2662567d1d49f448e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 28 Dec 2015 22:44:52 -0500
Subject: fix merge conflicts

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

(limited to 'SharedVersion.cs')

diff --git a/SharedVersion.cs b/SharedVersion.cs
index d37096748..9a061068e 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5800.0")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5800.1")]
-- 
cgit v1.2.3