diff options
| author | Nathan Lasseter <nathan@4574.co.uk> | 2012-12-12 21:33:43 +0000 |
|---|---|---|
| committer | Nathan Lasseter <nathan@4574.co.uk> | 2012-12-12 21:33:43 +0000 |
| commit | 79d992cf0c206011a878db55f40ea595a4977973 (patch) | |
| tree | 7fc070cc7b245cf2bb802f065bf6925d7b68cef1 | |
| parent | dcfd4df060a3286cd563a67ac0384c703285d700 (diff) | |
| parent | be07cfff95cdf2ed766e6f722303956b652b9fd6 (diff) | |
Merge branch 'master' of github.com:User4574/FISh-Configs
Conflicts:
config.fish
| -rw-r--r-- | config.fish | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.fish b/config.fish index f5f488d..41e894c 100644 --- a/config.fish +++ b/config.fish @@ -2,5 +2,6 @@ alias she='ssh njel500@milan.cs.york.ac.uk' alias sft='sftp njel500@milan.cs.york.ac.uk' alias shx='ssh -YC njel500@milan.cs.york.ac.uk' alias 4574='ssh nathan@4574.co.uk' +alias grope='ping' set -x PATH /home/nathan/bin $PATH /opt/android-sdk-linux_x86/platform-tools/ |