aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-15 23:38:25 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-15 23:38:25 -0400
commit19c3ad643cd3f5eba0682fb9700187751f71c2d8 (patch)
tree28c4cc3e5300fe111c78d25376e92e46d121b627
parent8bd3b9f8d8c90f9ada1280bd62af7bd2f9e16108 (diff)
fix merge conflict
-rw-r--r--SharedVersion.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 15b923d63..b2c885b0a 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.27.0")]
+[assembly: AssemblyVersion("3.2.27.1")]