fix merge conflict

8 years ago · f66a25db1c
parent 42cbe62990
commit f66a25db1c
1 changed files with 2 additions and 2 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.1.*")]
+//[assembly: AssemblyVersion("3.0.6060")]