"docs/vscode:/vscode.git/clone" did not exist on "c2f0260c12e3d3c917a7242ef235832b6dbfd66d"
Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts: plugins/osx/osx.plugin.zsh
plugins/emoji/README.md
0 → 100644
plugins/emoji/emoji-data.txt
0 → 100644
Please register or sign in to comment