resolve merge conflicts in VERSION files

This commit is contained in:
William Cheng 2020-01-20 18:05:23 +08:00
parent 4ec3900d31
commit bbada4fe7c
2 changed files with 0 additions and 8 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD
5.0.0-SNAPSHOT
=======
4.2.3-SNAPSHOT
>>>>>>> origin/4.3.x

View File

@ -1,5 +1 @@
<<<<<<< HEAD
5.0.0-SNAPSHOT
=======
4.2.3-SNAPSHOT
>>>>>>> origin/4.3.x