fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-06-11 18:04:47 -04:00
parent 58d6778876
commit 9ee58d399c

View File

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