fix merge conflict

8 years ago · 7fdd180b20
parent 345a619d93
commit 7fdd180b20
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.2.0")]
+[assembly: AssemblyVersion("3.2.1.100")]