From 26bf46ad54973c05fad18a7dda15ac89f63a762f Mon Sep 17 00:00:00 2001
From: jomido <jomido@nhdc.local>
Date: Wed, 23 May 2018 10:21:47 -0500
Subject: [PATCH] Fixed merge issues

---
 bash/.bashrc | 3 ---
 vim/.vimrc   | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 01d5fc1..357dde3 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,7 +24,6 @@ export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
-<<<<<<< HEAD
 #vi readline
 set -o vi
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
@@ -32,5 +31,3 @@ bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'
 
 #fix clear screen in vi mode
 bind -m vi-insert "\C-l":clear-screen
-=======
->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
diff --git a/vim/.vimrc b/vim/.vimrc
index 19ba076..a148695 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -51,13 +51,13 @@ nnoremap <C-j> <C-W><C-J>
 nnoremap <C-k> <C-W><C-K>
 nnoremap <C-l> <C-W><C-L>
 nnoremap <C-h> <C-W><C-H>
-<<<<<<< HEAD
+
 " use jj to escape insert mode 
 inoremap jj <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
 nnoremap <CR> o<Esc>
-=======
+
 " use jk to escape insert mode - using easyescape plugin 
 let g:easyescape_chars = { "j": 1, "k": 1 }
 let g:easyescape_timeout = 100
@@ -67,7 +67,6 @@ cnoremap kj <ESC>
 " blank lines
 nnoremap <Enter> o<ESC>
 nnoremap <S-Enter> O<ESC>
->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 nnoremap <leader>l :ls<CR>:b<Space>
 nnoremap <Tab> :bnext<CR>
@@ -90,7 +89,6 @@ Plugin 'VundleVim/Vundle.vim'
 Plugin 'tpope/vim-fugitive'
 Plugin 'kien/ctrlp.vim'
 Plugin 'scrooloose/nerdtree'
-"Plugin 'fholgado/minibufexpl.vim'
 Plugin 'tmhedberg/SimpylFold'
 Plugin 'vim-scripts/indentpython.vim'
 Plugin 'scrooloose/syntastic'
@@ -102,13 +100,10 @@ Plugin 'taohex/lightline-buffer'
 Plugin 'itchyny/calendar.vim'
 Plugin 'davidhalter/jedi-vim'
 Plugin 'tpope/vim-surround'
-<<<<<<< HEAD
 Plugin 'ap/vim-buftabline'
 Plugin 'wellle/targets.vim'
-=======
 Plugin 'junegunn/goyo.vim'
 Plugin 'zhou13/vim-easyescape'
->>>>>>> 8339691402a347f81d8e7896e8acfc8cebca7ddf
 
 call vundle#end()            " required
 filetype plugin indent on    " required