From 4f8684a16b1102056bd2b527dcbd585b78dd8000 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 27 Aug 2017 13:34:42 -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 fcd6b4bee8..e8903fbb5c 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.28.0")]
+[assembly: AssemblyVersion("3.2.28.8")]