From 4679f0aed6c57f725ec5fc441e9a20588f288b6d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 14 Dec 2015 09:41:56 -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 7c33af3a17..e1a4ca04b2 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5781.4")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5781.5")]