fix merge conflict

This commit is contained in:
Luke Pulverenti 2015-12-18 12:30:07 -05:00
parent e2041c049b
commit 304a04fc5e

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.6")] [assembly: AssemblyVersion("3.0.5781.7")]