fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-01-26 15:40:00 -05:00
parent 44d41ad74c
commit 0d0e4ad695

View File

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