fix merge conflict
This commit is contained in:
parent
44d41ad74c
commit
0d0e4ad695
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.1.*")]
|
//[assembly: AssemblyVersion("3.1.*")]
|
||||||
[assembly: AssemblyVersion("3.1.2")]
|
[assembly: AssemblyVersion("3.1.286")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user