DevFW-CICD/spring-petclinic
12
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-04-25 20:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature2/2025.03.30' of github.com:thirupathi626468/spring-petclinic into feature2/2025.03.30

Browse source 
to resloved the conflicts marge these changes
This commit is contained in:
thirupathi991288 2025-03-30 14:20:42 +05:30
commit fb1f01a26d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pom.xml
View file

@ -2,7 +2,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<!-- push my changes on iuse ssh feature/2025.03.30-->
<<<<<<< HEAD
<!-- B-Developer made same changes on feature2/2025.03.30 -->
=======
<!-- A-Developer made same changes on feature2/2025.03.30 -->
>>>>>>> f825992acb26c01f1af53305343a9ee693b4da2b
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>