fix merge conflict

8 years ago · 0ac0a09c80
parent 49fd5551ba
commit 0ac0a09c80
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.5")]
+[assembly: AssemblyVersion("3.2.6.1")]