Skip to content

Commit 8759b44

Browse files
author
Giorgi
committed
Решение конфликта в f1.txt
2 parents 73b4057 + 094261e commit 8759b44

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

‎f1.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
first filee
1+
<<<<<<< HEAD
2+
elif
3+
=======
4+
elif
5+
>>>>>>> 094261ef8721a85397e474526285757a3f03680e

0 commit comments

Comments
 (0)