fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-07-01 02:10:25 -04:00
parent 0f7a26ecc1
commit 05b0527894
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.5980")]
[assembly: AssemblyVersion("3.1.50")]