fix merge conflict

pull/702/head
Luke Pulverenti 9 years ago
parent 43377ec1e2
commit 93817bdb7b

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

Loading…
Cancel
Save