6 lines
73 B
Plaintext

<<<<<<< HEAD
2.3.0-SNAPSHOT
=======
2.2.3-SNAPSHOT
>>>>>>> origin/master