Merge branch 'master' of ssh://jonfu.com/home/jon/dots

Conflicts: bash/.bashrc
2018-06-24 15:31:12 -05:00
parent 02be8e62b4 92b38dfb53
commit 70573e3500
1 changed files with 0 additions and 1 deletions
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,7 +24,6 @@ alias p='ping'
 alias s='sudo'
 alias dmesg='dmesg -H'
 alias ip='ip -c'
-alias poop='/usr/bin/sleep'

 #golang stuff
 export GOPATH=$HOME/gopath