1 files changed, 7 insertions, 0 deletions

diff --git a/.bash_aliases b/.bash_aliases
index a5345db..756b5f2 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -13,12 +13,19 @@ 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'
+
+# misc
+alias ll='ll -h'
 alias v='vim'
 alias ai='sudo apt-get install'
 alias hg='history|grep'