remove erronous merge indicator from zshrc
[dotfiles.git] / vim /
drwxr-xr-x   parent (dest: ; base: c86827f64a17637684f5273ca5ec1c1a4e6080b9)