From 730dd523c07a06105b8e0f597c782f1dd5d80a7e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 6 Feb 2017 01:52:21 -0500
Subject: [PATCH] fix merge conflict

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

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 05eb1febbe..b63f7d15e9 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,3 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.1.295")]
+[assembly: AssemblyVersion("3.2.0.100")]