Skip to content

Instantly share code, notes, and snippets.

@hampelm

hampelm/gist:2883988

Created June 6, 2012 19:07
Show Gist options
  • Save hampelm/2883988 to your computer and use it in GitHub Desktop.
Save hampelm/2883988 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
<<<<<<< HEAD [aka the thing you just pulled]
hello
=======
goodbye
>>>>>>> experiment:... [aka your files]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment