fix merge conflicts

This commit is contained in:
Luke Pulverenti
2016-07-23 16:12:52 -04:00
parent 352ff3b212
commit d661f690f5
2 changed files with 2 additions and 4 deletions

View File

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