fix merge conflict

9 years ago · 870c843194
parent c904bec20d
commit 870c843194
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.6070")]
+[assembly: AssemblyVersion("3.1.121")]