fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-27 16:43:31 -05:00
parent 03118de6b7
commit 88153d3875

View File

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