fix merge conflicts

This commit is contained in:
Luke Pulverenti
2017-09-20 13:22:11 -04:00
parent effac5e882
commit ec426d5c92
2 changed files with 121 additions and 73 deletions

View File

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