fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-02-06 01:52:21 -05:00
parent 6f1a300bde
commit 730dd523c0

View file

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