fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-14 09:41:56 -05:00
parent ba1b7603eb
commit 4679f0aed6

View file

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