1 files changed, 7 insertions, 6 deletions
diff --git a/bashrc b/bashrc
index 064c66e..6a0c6a3 100755
--- a/bashrc
+++ b/bashrc
@@ -35,6 +35,13 @@ 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)"
 # }}}
@@ -42,12 +49,6 @@ alias lh='ls -lh'
 PATH=~/.local/bin:"${PATH}"
 export PATH
 # }}}
-# {{{ virtualenvwrapper
-export WORKON_HOME=$HOME/.virtualenvs
-export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python3
-export VIRTUALENVWRAPPER_VIRTUALENV_ARGS=' -p /usr/bin/python3 '
-#source /usr/local/bin/virtualenvwrapper.sh # system package is installed
-# }}}
 # {{{ reticulate
 export RETICULATE_PYTHON=/usr/bin/python3
 export RETICULATE_AUTOCONFIGURE=FALSE