Cleanup .orig files.

lib/aliases.zsh.orig

@@ -1,52 +0,0 @@
-# Push and pop directories on directory stack
-alias pu='pushd'
-alias po='popd'
-
-# Basic directory operations
-alias ...='cd ../..'
-alias -- -='cd -'
-
-# Super user
-alias _='sudo'
-alias please='sudo'
-
-#alias g='grep -in'
-
-# Show history
-if [ "$HIST_STAMPS" = "mm/dd/yyyy" ]
-then
-    alias history='fc -fl 1'
-elif [ "$HIST_STAMPS" = "dd.mm.yyyy" ]
-then
-    alias history='fc -El 1'
-elif [ "$HIST_STAMPS" = "yyyy-mm-dd" ]
-then
-    alias history='fc -il 1'
-else
-    alias history='fc -l 1'
-fi
-
-alias afind='ack-grep -il'
-# List direcory contents
-alias lsa='ls -lah'
-<<<<<<< HEAD
-alias l='ls -la'
-alias ll='ls -l'
-alias la='ls -lA'
-alias l=la
-=======
-alias l='ls -lah'
-alias ll='ls -lh'
-alias la='ls -lAh'
->>>>>>> blessed-master
-alias sl=ls # often screw this up
-# Git aliases
-alias gita='git add -A'
-alias gits='git st'
-alias gitl='git l'
-alias gitw='git who'
-alias gitt='git tags'
-# Aliases
-alias ta='tmux attach -t'
-alias tl='tmux list-session'
-alias ts='tmux new-session'