fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-21 12:50:05 -05:00
parent e290f24718
commit 7dffc197da

View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5781.7")] [assembly: AssemblyVersion("3.0.5781.9")]