fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-07-27 15:31:19 -04:00
parent 677709f420
commit b3db8fdb0d

View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.0.6000")]
[assembly: AssemblyVersion("3.1.80")]