fix merge conflict

9 years ago · 9a956f5e29
parent 053ea1a6ba
commit 9a956f5e29
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.1.106")]
+[assembly: AssemblyVersion("3.0.6060")]