Skip to content

Instantly share code, notes, and snippets.

@ohammersmith

ohammersmith/snippet.txt

Created December 12, 2008 19:47
Show Gist options
  • Save ohammersmith/35246 to your computer and use it in GitHub Desktop.
Save ohammersmith/35246 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
snippet.txt
Yet another file.
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
<<<<<<< HEAD:file5.txt
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
=======
tempor blah blah blah et dolore magna aliqua. baz baz baz baz baz,
>>>>>>> 6be17bd... Adding some baz's to join the blah's.:file5.txt
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment