From 5302cd5b20e8c160d288886732b410124091878f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 28 Oct 2017 23:53:54 -0400
Subject: [PATCH] resolve merge conflict

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

diff --git a/SharedVersion.cs b/SharedVersion.cs
index f7bc6e9c7..1a5c5dde2 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.34.0")]
+[assembly: AssemblyVersion("3.2.34.2")]