fix merge

This commit is contained in:
Luke Pulverenti
2015-09-21 12:23:20 -04:00
parent e90072b75f
commit 7876ee06d9
4 changed files with 47 additions and 144 deletions

View File

@@ -1,4 +1,4 @@
using System.Reflection;
[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5724.4")]
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5724.5")]