From e99bc61d53f393dc475e265e3b5bc8c19b186594 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 23 Jul 2017 02:11:54 -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 c1fcd083e..65368da5e 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.25.0")]
+[assembly: AssemblyVersion("3.2.25.12")]
-- 
cgit v1.2.3