From 66e901ef93942c631c3ee3b222cc75265e1b17fb Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 7 Apr 2017 15:26:19 -0400
Subject: fix merge conflicts

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

(limited to 'SharedVersion.cs')

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 6b21062fa1..891f858e00 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.10")]
+[assembly: AssemblyVersion("3.2.10.7")]
-- 
cgit v1.2.3