Created
October 26, 2012 12:22
-
-
Save d6rkaiz/3958477 to your computer and use it in GitHub Desktop.
neocomplcache-snippets-complete
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
| remote: Counting objects: 79, done. | |
| remote: Compressing objects: 100% (50/50), done. | |
| remote: Total 79 (delta 12), reused 79 (delta 12) | |
| Unpacking objects: 100% (79/79), done. | |
| From https://github.com/Shougo/neocomplcache-snippets-complete | |
| + 77b3a19...c2db19f master -> origin/master (forced update) | |
| Auto-merging syntax/snippet.vim | |
| CONFLICT (add/add): Merge conflict in syntax/snippet.vim | |
| Auto-merging autoload/unite/sources/snippet.vim | |
| CONFLICT (add/add): Merge conflict in autoload/unite/sources/snippet.vim | |
| Auto-merging autoload/neocomplcache/sources/snippets_complete.vim | |
| CONFLICT (add/add): Merge conflict in autoload/neocomplcache/sources/snippets_complete.vim | |
| Automatic merge failed; fix conflicts and then commit the result. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment