fix merge conflict

8 years ago · b3db8fdb0d
parent 677709f420
commit b3db8fdb0d
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.6000")]
+[assembly: AssemblyVersion("3.1.80")]