fix merge conflict

8 years ago · 94ddbfd57f
parent 3f7f33bd51
commit 94ddbfd57f
1 changed files with 1 additions and 1 deletions
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,4 @@
 using System.Reflection;

 //[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.0.8000")]
+[assembly: AssemblyVersion("3.1.188")]