fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-01 22:32:53 -05:00
parent 43377ec1e2
commit 93817bdb7b

View file

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