Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Commit b245584

Browse files
shubhansu-krshubhansu-kr
committed
UPdaetd
Signed-off-by: shubhansu-kr <shubhansu2021@gmail.com>
2 parents 56c7870 + 8b2ee24 commit b245584

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

‎contributors/shubhansu-kr/Challenge13.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,9 @@ Making some random changes
33
to create a conflict
44
=======
55
Challenge14: Solve Merge Conflict
6+
<<<<<<< HEAD
67
>>>>>>> d8575c4 (Updated challenge14)
8+
=======
9+
>>>>>>> mergerbranch
10+
11+
>>>>>>> 8b2ee248e99590d49e5e50c1a14ededcc6c94702

0 commit comments

Comments
 (0)