fix merge conflict

8 years ago · 00b80a33c1
parent aa66b9cf3d
commit 00b80a33c1
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.72")]
+[assembly: AssemblyVersion("3.1.*")]
+//[assembly: AssemblyVersion("3.0.5986")]