fix merge conflict

9 years ago · 0be3fdc062
parent 96f6985b4b
commit 0be3fdc062
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.0.*")]
+[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5921")]
+//[assembly: AssemblyVersion("3.0.5911")]