linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-03 04:20:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/coffee/coffee.plugin.zsh
View file

@ -10,7 +10,11 @@ cfc () {
}
# compile from clipboard & print
<<<<<<< HEAD
alias cfp='cf "$(clippaste)"'
=======
alias cfp='coffeeMe "$(clippaste)"'
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
# compile from clipboard and copy to clipboard
alias cfpc='cfp | clipcopy'