1 files changed, 7 insertions, 1 deletions

diff --git a/.bash_aliases b/.bash_aliases
index 93b14da..756b5f2 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -13,7 +13,14 @@ alias cds='cd ~/git/settings'
 alias dp='docker ps'
 alias dpa='docker ps -a'
 
+<<<<<<< HEAD
+# ssh
+alias topo='ssh typebrook@topo.tw'
+
+# misc
+=======
 #tig
+>>>>>>> fe017342dc93d52ff6c85b041c1905377521e3ab
 alias ta='tig --all'
 alias tiga='tig --all'
 
@@ -25,7 +32,6 @@ alias hg='history|grep'
 alias gc='git clone'
 alias co='curl -O'
 alias ptt='ssh bbsu@ptt.cc'
-alias gcp='ssh typebrook@topo.tw'
 alias taiwan='curl -O http://download.geofabrik.de/asia/taiwan-latest.osm.pbf'
 
 # tmp