From cf5089bf4652723876a1fe82af88caa81cb90527 Mon Sep 17 00:00:00 2001
From: jon <jon@f01>
Date: Sun, 31 Jan 2021 20:48:05 -0600
Subject: [PATCH] Fix merge

---
 bash/.bashrc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 6485569..845b91f 100644
--- 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() {