Created
February 12, 2014 20:41
-
-
Save pbrewczynski/8964075 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
| <<<<<<< HEAD | |
| This is first version with typo | |
| ======= | |
| This is first verion with typo | |
| This is new feature of this text, it has new chars in it, so it | |
| is very cool | |
| >>>>>>> newFeature |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment