mirror of
https://github.com/openSUSE/osc.git
synced 2024-11-15 00:36:11 +01:00
6 lines
80 B
Plaintext
6 lines
80 B
Plaintext
|
<<<<<<< foo.mine
|
||
|
|
This is no test.
|
||
|
|
=======
|
||
|
|
This is a simple test.
|
||
|
|
>>>>>>> foo.r2
|