fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-11-02 12:07:27 -04:00
parent 4ab9b1dffb
commit 589300a3b0

View File

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