aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-24 15:21:00 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-02-24 15:21:00 -0500
commitc07e774ca9c0f234ec6899e17fc70301d1990290 (patch)
tree79e2ee30f5fb27e11bb834b968a5658e77fa75d1
parent5d5f4162eb06bc1b6a674560c905aead182fa548 (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 81f743259..069f6e9fc 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.3")]
+[assembly: AssemblyVersion("3.2.3.1")]