conflicts-one.txt 93 Bytes
Newer Older
Edward Thomson committed
1 2 3 4 5
<<<<<<< HEAD
This is most certainly a conflict!
=======
This is a conflict!!!
>>>>>>> branch