fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-16 00:10:14 -04:00
parent 053ea1a6ba
commit 9a956f5e29

View File

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