Skip to content

Instantly share code, notes, and snippets.

@rlivsey

rlivsey/conflicted

Created February 2, 2010 14:59
Show Gist options
  • Save rlivsey/292725 to your computer and use it in GitHub Desktop.
Save rlivsey/292725 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
conflicted
<<<<<<< HEAD
=======
>>>>>>> master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment