Files
git-conflict-test/test.txt
2025-11-25 12:05:07 +03:00

22 lines
90 B
Plaintext

10
<<<<<<< HEAD
20
30
40
55
66
77
88
90
=======
21
31
41
51
61
71
81
91
>>>>>>> master
00