fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-14 16:55:21 -05:00
parent 93ae4aab76
commit 5c03b0d769

View File

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