From 7d15b140cfe4f761e03f661f82cf946f327863f5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 20 Nov 2017 13:02:46 -0500
Subject: [PATCH] fix merge conflict

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

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 404fa3e844..580bc70016 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.36.0")]
+[assembly: AssemblyVersion("3.2.40.0")]