Fixing merge conflicts and stuff

2019-03-14 15:59:26 -05:00
parent b5bb2261b7 6983714075
commit 887040c0dc
4 changed files with 9 additions and 13 deletions
--- a/vim/.vim/.netrwhist
+++ b/vim/.vim/.netrwhist
@@ -6,3 +6,4 @@ let g:netrw_dirhist_3='/home/jon'
 let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
 let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'
 let g:netrw_dirhist_6='/home/jon/projects/asciidoc/template'
+let g:netrw_dirhist_7='/home/jon/projects/contract_management/app'