fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-10-20 15:27:27 -04:00
parent b90b64aae8
commit 40255e6014

View File

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