Skip to content

Instantly share code, notes, and snippets.

@armandofox

armandofox/git_conflict_markers.txt

Created August 20, 2020 18:57
Show Gist options
  • Save armandofox/708b2be6cbc71f1f3d499e683a4474fb to your computer and use it in GitHub Desktop.
Save armandofox/708b2be6cbc71f1f3d499e683a4474fb to your computer and use it in GitHub Desktop.
Download ZIP
git_conflict_markers.txt
Raw
git_conflict_markers.txt
Roses are red,
Violets are blue.
<<<<<<< HEAD:poem.txt
I love GitHub,
=======
ProjectLocker rocks,
>>>>>>> 77976da35a11db4580b80ae27e8d65caf5208086:poem.txt
and so do you.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment