aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-11-02 12:07:27 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-11-02 12:07:27 -0400
commit589300a3b004854457faab8a04fc86da5fffbac1 (patch)
treeb9e18b4a466641f70916bac768b4140c4a088810
parent4ab9b1dffbc70deb041d9f677adb7e9a1731522c (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 34272716d..e61a50da2 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.35.0")]
+[assembly: AssemblyVersion("3.2.35.2")]