Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-21 15:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch_1 into branch_2

Browse source
This commit is contained in:
Sergey_Khvostov 2024-02-29 21:54:53 +03:00
commit e7436f0147
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
textForCommit.txt
View file

@ -1,4 +1,10 @@
<<<<<<< HEAD
branch_2: 1st edit
branch_2: 2nd edit
branch_2: 3d edit
=======
branch_1: 1st edit
branch_1: 2nd edit
branch_1: 3d edit
>>>>>>> branch_1