From 65db32b1f878cd478e9f4b2b4c988890a7ca47c9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 12 May 2017 14:18:42 -0400
Subject: fix merge conflict

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

(limited to 'SharedVersion.cs')

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 81877184d..1ef530ece 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.15.0")]
+[assembly: AssemblyVersion("3.2.15.5")]
-- 
cgit v1.2.3