mirror of
https://git.proxmox.com/git/libgit2
synced 2025-08-03 05:30:40 +00:00
6 lines
93 B
Plaintext
6 lines
93 B
Plaintext
<<<<<<< HEAD
|
|
This is most certainly a conflict!
|
|
=======
|
|
This is a conflict!!!
|
|
>>>>>>> branch
|