fix merge conflict
This commit is contained in:
parent
6dc8bf9aa1
commit
65db32b1f8
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.15.0")]
|
[assembly: AssemblyVersion("3.2.15.5")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user