fix merge conflict

pull/1154/head
Luke Pulverenti 8 years ago
parent 9012759769
commit 821d673111

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

Loading…
Cancel
Save