conflicts-two.txt 107 Bytes
Newer Older
Edward Thomson committed
1 2 3 4 5
<<<<<<< HEAD
This is without question another conflict!
=======
This is another conflict!!!
>>>>>>> branch