fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-04-17 16:59:20 -04:00
parent 6bbf0e8248
commit 8b163221f7

View file

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