fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-04-16 15:25:16 -04:00
parent 670a388f61
commit 007f4e193a

View File

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