From 0be3fdc062ab218ba5702f065b4bee565850c402 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 31 Mar 2016 12:44:02 -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 e0c8719c1..2d2a44ae5 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5921")]
+[assembly: AssemblyVersion("3.0.*")]
+//[assembly: AssemblyVersion("3.0.5911")]