fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-12-18 00:43:37 -05:00
parent bc58e2862c
commit 4853e795d7
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.8500")]
[assembly: AssemblyVersion("3.1.259")]