forked from loafle/openapi-generator-original
resolve merge conflicts in VERSION files
This commit is contained in:
parent
4ec3900d31
commit
bbada4fe7c
@ -1,5 +1 @@
|
||||
<<<<<<< HEAD
|
||||
5.0.0-SNAPSHOT
|
||||
=======
|
||||
4.2.3-SNAPSHOT
|
||||
>>>>>>> origin/4.3.x
|
||||
|
@ -1,5 +1 @@
|
||||
<<<<<<< HEAD
|
||||
5.0.0-SNAPSHOT
|
||||
=======
|
||||
4.2.3-SNAPSHOT
|
||||
>>>>>>> origin/4.3.x
|
||||
|
Loading…
x
Reference in New Issue
Block a user