mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-04-24 11:22:48 +00:00
updated pom.xml file
This commit is contained in:
parent
0aa30d88fc
commit
d78acce6f2
1 changed files with 2 additions and 2 deletions
4
pom.xml
4
pom.xml
|
@ -5,8 +5,8 @@
|
|||
<<<<<<< HEAD
|
||||
<!-- B-Developer made same changes on feature2/2025.03.30 -->
|
||||
=======
|
||||
<!-- A-Developer made same changes on feature2/2025.03.30 mvn-->
|
||||
<!-- A-Developer made same changes on feature2/2025.03.30 mvn-->
|
||||
<!-- A-Developer made same changes on feature2/2025.03.30 -->
|
||||
<!-- A-Developer made same changes on feature2/2025.04.06-->
|
||||
|
||||
>>>>>>> f825992acb26c01f1af53305343a9ee693b4da2b
|
||||
<parent>
|
||||
|
|
Loading…
Reference in a new issue