Testing conflict resolution

2018-06-24 15:27:25 -05:00
parent 36ce64ada6
commit f9777101cf
2 changed files with 2 additions and 1 deletions
--- 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
--- 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>