Created
January 4, 2015 03:16
-
-
Save wmantly/620f176114db19447de2 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $ 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