fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-01-02 18:26:29 -05:00
parent e76d198a86
commit 895f4a1be4

View File

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