Fix merge

2021-01-31 20:48:05 -06:00
parent 93c6983260
commit cf5089bf46
1 changed files with 0 additions and 3 deletions
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -31,11 +31,8 @@ alias ip='ip -c'
 alias s='sudo'
 alias df='sudo df -hT -x tmpfs -x devtmpfs'

-<<<<<<< HEAD
 bind 'set completion-ignore-case on'
-=======
 set bell-style none
->>>>>>> 3d623955297969837dad68344ea49fc073d400bc

 ## function and alias for short find
 short_find() {