1 files changed, 0 insertions, 7 deletions
diff --git a/bashrc b/bashrc
index 6a0c6a3..0f4cba9 100755
--- a/bashrc
+++ b/bashrc
@@ -35,13 +35,6 @@ alias l='ls -CF'
 alias lh='ls -lh'
 # }}}
 # {{{varia
-<<<<<<< HEAD
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-#shopt -s checkwinsize
-
-=======
->>>>>>> jrwb/main
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 # }}}