fix merge conflicts
This commit is contained in:
parent
885d1f55a6
commit
5dca8cb077
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.12")]
|
[assembly: AssemblyVersion("3.2.12.11")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user