Fixed merge error.

2020-03-10 16:49:47 -04:00 · 2020-03-10 16:49:47 -04:00 · 8ef4f30731
parent 19d90c9add
commit 8ef4f30731
1 changed files with 0 additions and 4 deletions
--- a/zsh/modules/alias/init.zsh
+++ b/zsh/modules/alias/init.zsh
@ -8,11 +8,7 @@ alias ls="ls $color_flag"
 alias l="ls -lh $color_flag"
 alias la="ls -lha $color_flag"

-<<<<<<< HEAD
-alias lf='ls -1tr | tail -1'
-=======
 alias lf="ls -1tr | tail -n 1"
->>>>>>> fdc2d49c6e53000b36e793ba7fdd9e1c8e8ec9bb

 alias docker="sudo docker"
 alias dc="sudo docker-compose"