fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-03-25 13:51:54 -04:00
parent 4a7df961dc
commit 736e632410

View File

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