fix merge conflicts
This commit is contained in:
parent
ee8c829c5b
commit
4f8684a16b
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.28.0")]
|
[assembly: AssemblyVersion("3.2.28.8")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user