Merge branch 'master' of ssh://jonfu.com/home/jon/dots
Conflicts: bash/.bashrc
This commit is contained in:
@@ -24,7 +24,6 @@ alias p='ping'
|
|||||||
alias s='sudo'
|
alias s='sudo'
|
||||||
alias dmesg='dmesg -H'
|
alias dmesg='dmesg -H'
|
||||||
alias ip='ip -c'
|
alias ip='ip -c'
|
||||||
alias poop='/usr/bin/sleep'
|
|
||||||
|
|
||||||
#golang stuff
|
#golang stuff
|
||||||
export GOPATH=$HOME/gopath
|
export GOPATH=$HOME/gopath
|
||||||
|
|||||||
Reference in New Issue
Block a user