fix merge conflicts

8 years ago · 5dca8cb077
parent 885d1f55a6
commit 5dca8cb077
1 changed files with 1 additions and 1 deletions
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,3 +1,3 @@
 using System.Reflection;
-[assembly: AssemblyVersion("3.2.12")]
+[assembly: AssemblyVersion("3.2.12.11")]