fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-02-16 12:15:06 -05:00
parent ea83790305
commit 1285512160

View File

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