fix merge conflict

This commit is contained in:
Luke Pulverenti 2017-05-31 15:40:15 -04:00
parent 7f0b4a5c34
commit c37c9a7507

View File

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