aboutsummaryrefslogtreecommitdiff
path: root/SharedVersion.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-04-20 23:49:33 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-04-20 23:49:33 -0400
commit5dca8cb077fb544628f62939bbda292d8c91b637 (patch)
treeb06748a26cad13df982d53068297624e4c233874 /SharedVersion.cs
parent885d1f55a67aab0cc9c9dd515374a3142d65ca81 (diff)
fix merge conflicts
Diffstat (limited to 'SharedVersion.cs')
-rw-r--r--SharedVersion.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 6abeddbc2..ab54dc780 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.12")]
+[assembly: AssemblyVersion("3.2.12.11")]