fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-04 00:47:50 -04:00
parent 4be3ee433b
commit 0c3b7a33c2
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.6020")]
[assembly: AssemblyVersion("3.1.89")]