fix merge conflicts

This commit is contained in:
Luke Pulverenti
2017-04-07 15:26:19 -04:00
parent 0535f663b6
commit 66e901ef93
2 changed files with 7 additions and 3 deletions

View File

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