From 304a04fc5e77d1738e9de26d1ff0d2919b024fb4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 18 Dec 2015 12:30:07 -0500
Subject: [PATCH] fix merge conflict

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

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 2ef3f5262d..b250770320 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5781.6")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5781.7")]