fix merge conflict

This commit is contained in:
Luke Pulverenti
2016-01-08 13:52:45 -05:00
parent 534c2a0e68
commit a387942107
2 changed files with 25 additions and 4 deletions

View File

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