fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-10-13 17:19:38 -04:00
parent 3f7f33bd51
commit 94ddbfd57f
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.0.8000")]
[assembly: AssemblyVersion("3.1.188")]