fix merge conflicts

This commit is contained in:
Luke Pulverenti
2017-10-01 23:35:31 -04:00
parent 27868803d8
commit f651fd6ffb
3 changed files with 26 additions and 123 deletions

View File

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