Skip to content

Commit 4c5f94d

Browse files
sathninduksathninduk
committed
conflict resolve
2 parents ff0bcfc + fdc1b88 commit 4c5f94d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

‎www.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
2-
ww text file
3-
ff
1+
wwp text file

‎www.txt.orig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<<<<<<< HEAD
2+
3+
ww text file
4+
ff
5+
=======
6+
wwp text file
7+
>>>>>>> test

0 commit comments

Comments
 (0)