commit 84e81937fe5ed77dec1c2cf419d8657b2866fa58
parent 7278a404cf8ca2e006d37dd0a34c17201821cd93
Author: NicholasFarrow <nicholas.w.farrow@gmail.com>
Date: Sun, 5 Jul 2020 03:05:25 +1000
testing
Diffstat:
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.config/.aliasrc b/.config/.aliasrc
@@ -1,6 +1,10 @@
alias ls="ls -hN --color=auto --group-directories-first"
alias grep="grep --color=auto"
-alias pi='ssh pi@1.1.12.22
+<<<<<<< Updated upstream
+alias pi='ssh pi@1.1.222.22
+=======
+alias pi='ssh pi@101.171.189
+>>>>>>> Stashed changes
alias prox='sudo openvpn --config client1.ovpn'
alias digo='ssh root@165.227.51.160'
alias lgs='ligo-proxy-init nicholas.farrow'