fix merge conflict

8 years ago · 40255e6014
parent b90b64aae8
commit 40255e6014
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.8200")]
+[assembly: AssemblyVersion("3.1.196")]