fix merge conflict
This commit is contained in:
parent
6f1a300bde
commit
730dd523c0
|
@ -1,4 +1,3 @@
|
|||
using System.Reflection;
|
||||
|
||||
//[assembly: AssemblyVersion("3.1.*")]
|
||||
[assembly: AssemblyVersion("3.1.295")]
|
||||
[assembly: AssemblyVersion("3.2.0.100")]
|
||||
|
|
Loading…
Reference in New Issue
Block a user