mirror of
https://github.com/opnsense/src.git
synced 2026-02-25 11:00:15 -05:00
18 lines
274 B
Text
18 lines
274 B
Text
|
This is a more complete test
|
||
|
|
<<<<<<< 1
|
||
|
|
which multiple lines
|
||
|
|
and a few typ0s to fix
|
||
|
|
||||||| 2
|
||
|
|
which multiple lines
|
||
|
|
and a few typos to fix
|
||
|
|
=======
|
||
|
|
and a few typ0s to fix
|
||
|
|
>>>>>>> 3
|
||
|
|
also I plan to add few lines
|
||
|
|
<<<<<<< 2
|
||
|
|
New line
|
||
|
|
=======
|
||
|
|
>>>>>>> 3
|
||
|
|
and to remove
|
||
|
|
other lines
|