fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-11-20 13:02:46 -05:00
parent 4c1834c087
commit 7d15b140cf

View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.36.0")]
[assembly: AssemblyVersion("3.2.40.0")]