resolve merge conflict

This commit is contained in:
Luke Pulverenti 2017-10-28 23:53:54 -04:00
parent 85370b847a
commit 5302cd5b20

View File

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