From 5dca8cb077fb544628f62939bbda292d8c91b637 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 20 Apr 2017 23:49:33 -0400
Subject: [PATCH] fix merge conflicts

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

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 6abeddbc21..ab54dc7807 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.12")]
+[assembly: AssemblyVersion("3.2.12.11")]