fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-08-25 14:45:56 -04:00
parent c904bec20d
commit 870c843194

View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")] //[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.0.6070")] [assembly: AssemblyVersion("3.1.121")]