fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-10-17 12:32:48 -04:00
parent 734d215940
commit f8a248ffd8

View File

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