fix conflict

yannvr · Jul 14, 2020 · 2696440 · 2696440
1 parent 5c6f56f
commit 2696440
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.zshrc.alias b/.zshrc.alias
@@ -15,15 +15,10 @@ a ag='ag -a'
 a jtags="ctags -R src && sed -i '' -E '/^(if|switch|function|module\.exports|it|describe).+language:js$/d' tags"
 a fu='fuck'
 a sl='screen -list'
-<<<<<<< HEAD
 a sr'screen -r'
 a sd'screen -d'
 a myip="curl http://ipecho.net/plain; echo"
-=======
-a sr='screen -r'
-a sd='screen -d'
 a fix-gitignore='git rm -r --cached . && git add . && git commit -m "fixed untracked files"'
->>>>>>> 2d0e49dd5f1bb2f92152c2ae49ec722b6c3bb36e
 
 
 HAS_NVIM=`which nvim`