fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-29 21:55:57 -05:00
parent ee06dfbc50
commit dbeea014aa

View file

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