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

Revert "created my test file"

Browse source 
This reverts commit f5161cf7d0.

Conflicts:
	testfile2
This commit is contained in:
Sreekanth Manthena 2023-05-26 08:16:33 -04:00
parent 372fd06b8a
commit 462449984f
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
testfile2
View file

@ -1,5 +1,8 @@
<<<<<<< HEAD
<<<<<<< HEAD
This is line1.
This is line2.
=======
>>>>>>> parent of f5161cf... created test file
=======
>>>>>>> parent of f5161cf... created test file