From fad71a6c7d12c8b207cdf473c7dd7daafa53c174 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 1 Jul 2017 12:23:46 -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 99521d8d0..686b4c737 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.20.0")]
+[assembly: AssemblyVersion("3.2.20.18")]
-- 
cgit v1.2.3