From 100236f416e1917d57913f117b7f0c4ee9069d0b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 29 Jul 2016 11:59:37 -0400
Subject: [PATCH] fix merge conflict

---
 SharedVersion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SharedVersion.cs b/SharedVersion.cs
index d81f6c71cb..7f78e641ae 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 //[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.0.6010")]
+[assembly: AssemblyVersion("3.1.81")]