fix merge conflict

8 years ago · 730dd523c0
parent 6f1a300bde
commit 730dd523c0
1 changed files with 1 additions and 2 deletions
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@ -1,4 +1,3 @@
 using System.Reflection;

-//[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.1.295")]
+[assembly: AssemblyVersion("3.2.0.100")]