From f651fd6ffba80a6f8e54fca7d014622692cc08f7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 1 Oct 2017 23:35:31 -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 5e3f25d37..5be0a1656 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.32")]
+[assembly: AssemblyVersion("3.2.32.16")]
-- 
cgit v1.2.3