From f9777101cfb6c31a8320aba35869419e0bdd6626 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc.local>
Date: Sun, 24 Jun 2018 15:27:25 -0500
Subject: [PATCH] Testing conflict resolution

---
 bash/.bashrc | 1 +
 vim/.vimrc   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 4e8f7f8..16474f1 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,6 +24,7 @@ alias ll='ls -lh'
 alias p='ping'
 alias s='sudo'
 alias ip='ip -c'
+alias fart='/usr/bin/sleep'
 
 #golang stuff
 export GOPATH=$HOME/gopath
diff --git a/vim/.vimrc b/vim/.vimrc
index a148695..a8e7047 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -27,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236
 set cursorline
 
 "enable relative line numbers
-set number relativenumber
+"set number relativenumber
 
 "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
 nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>