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

Merge branch 'master' of github.com:pebcac/oh-my-zsh

Browse source 
Conflicts:
	custom/example.zsh
This commit is contained in:
Preston Davis 2015-10-11 20:47:01 -04:00
commit 535f9f7a66
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
custom/example.zsh
View file

@ -3,7 +3,11 @@
# #
# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr # brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
# #
<<<<<<< HEAD
alias p='tail -1 /home/pdavis/notes.txt | pbcopy' alias p='tail -1 /home/pdavis/notes.txt | pbcopy'
alias pbcopy='xsel --clipboard --input' alias pbcopy='xsel --clipboard --input'
alias rosh='ssh pdavis-admin@opsware.discovery.com -p 2222' alias rosh='ssh pdavis-admin@opsware.discovery.com -p 2222'
alias console='cu -t -l /dev/ttyUSB0 -s 115200' alias console='cu -t -l /dev/ttyUSB0 -s 115200'
=======
[[ $TERM != "screen" ]] && exec tmux
>>>>>>> 2877573c110ffc587f156ed6601ac732f647466a