fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-01-02 18:12:56 -05:00
parent 6f02073540
commit c0c663a174

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.3")] [assembly: AssemblyVersion("3.0.5784.0")]