Browse Source

fix merge conflict

Luke Pulverenti 8 years ago
parent
commit
7fdd180b20
1 changed files with 1 additions and 2 deletions
  1. 1 2
      SharedVersion.cs

+ 1 - 2
SharedVersion.cs

@@ -1,4 +1,3 @@
 using System.Reflection;
 
-//[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.2.0")]
+[assembly: AssemblyVersion("3.2.1.100")]