Skip to content

Instantly share code, notes, and snippets.

@jbilcke

jbilcke/wtfisthisdiff

Created November 2, 2011 18:35
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save jbilcke/1334459 to your computer and use it in GitHub Desktop.
Save jbilcke/1334459 to your computer and use it in GitHub Desktop.
Download ZIP
wtf is this diff?
Raw
wtfisthisdiff
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 75e9c553ff4894231f0b5df4b25b489e43556583
=======
>>>>>>> 75e9c553ff4894231f0b5df4b25b489e43556583
=======
>>>>>>> 75e9c553ff4894231f0b5df4b25b489e43556583
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment