fix merge conflict
This commit is contained in:
parent
54886db5e5
commit
9d762c3878
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.1.*")]
|
//[assembly: AssemblyVersion("3.1.*")]
|
||||||
[assembly: AssemblyVersion("3.0.6200")]
|
[assembly: AssemblyVersion("3.1.126")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user