Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2026-01-23 03:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge conflict and complete merge

Browse source
This commit is contained in:
Lanaetan 2025-04-26 21:45:25 +08:00
commit 415add1982
14 changed files with 104 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/resources/messages/messages.properties
View file

@ -1,4 +1,4 @@
welcome=Welcome
welcome=Welcome to Spring Petclinic
required=is required
notFound=has not been found
duplicate=is already in use