Skip to content

Instantly share code, notes, and snippets.

@wmantly

wmantly/gist:620f176114db19447de2

Created January 4, 2015 03:16
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 wmantly/620f176114db19447de2 to your computer and use it in GitHub Desktop.
Save wmantly/620f176114db19447de2 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
$ cat README
This is the README file.
<<<<<<< HEAD
This line was added from the 'master' branch.
=======
The 'test' branch version is here.
>>>>>>> test
One more line.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment