Created
May 5, 2015 20:10
-
-
Save jag3773/7c658e1ba7dd860525c5 to your computer and use it in GitHub Desktop.
conflict
This file contains 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
| bash-4.2$ git pull | |
| U _sass/fonts.scss | |
| Pull is not possible because you have unmerged files. | |
| Please, fix them up in the work tree, and then use 'git add/rm <file>' | |
| as appropriate to mark resolution, or use 'git commit -a'. | |
| bash-4.2$ git diff | |
| diff --cc _sass/fonts.scss | |
| index 24efdc5,043813c..0000000 | |
| --- a/_sass/fonts.scss | |
| +++ b/_sass/fonts.scss | |
| @@@ -42,7 -42,7 +42,11 @@@ | |
| } | |
| // Noto Sans Ethiopic supports these languages | |
| ++<<<<<<< HEAD | |
| +:lang(am), // Amharic, Geez | |
| ++======= | |
| + :lang(am), // Amharic | |
| ++>>>>>>> c458ed0f84220e19ba008fc6fe9dd9da37265844 | |
| :lang(gez), // Geez | |
| :lang(ti), // Tigrinya | |
| :lang(tir), // Tigrinya |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment