fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-07-22 13:59:14 -04:00
parent aa66b9cf3d
commit 00b80a33c1

View File

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