fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-16 01:54:27 -04:00
parent 42cbe62990
commit f66a25db1c

View File

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