Git-Training-Hub/git-practice-Renejit
22
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolving the merge conflit

Browse Source
This commit is contained in:
Renejit
2025-09-17 16:43:10 +05:30
parent 9780a29da2 06f4ad109d
commit d7b7bf6869
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
example.txt
View File

@ -1,5 +1,13 @@
Tech Thursday assignment 3 Tech Thursday assignment 3 updated
date 10-09-2025 date 10-09-2025
<<<<<<< HEAD
wed wed
wednesday wednesday
assignment completed assignment completed
=======
wednesday
Practise session extended to Thursday
date 11-09-2025
New text added
line added from feature-1 branch
>>>>>>> 06f4ad109d06b03307110696e71d6e7166aaf2b7