fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-12-28 16:13:01 -05:00
parent 9ca0c04ee7
commit e47ccdce42
1 changed files with 1 additions and 1 deletions

View File

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