From 02be8e62b47cdd5c8dbff4f3ea7edb056dce8307 Mon Sep 17 00:00:00 2001
From: jon <jon@nhdc.local>
Date: Sun, 24 Jun 2018 15:29:23 -0500
Subject: [PATCH] Testing conflict

---
 bash/.bashrc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 50128b0..b063da7 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -22,11 +22,9 @@ alias l='ls -lh --color=auto'
 alias ll='ls -lh --color=auto'
 alias p='ping'
 alias s='sudo'
-<<<<<<< HEAD
 alias dmesg='dmesg -H'
-=======
 alias ip='ip -c'
->>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3
+alias poop='/usr/bin/sleep'
 
 #golang stuff
 export GOPATH=$HOME/gopath
@@ -35,13 +33,10 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
-<<<<<<< HEAD
 alias p='ping'
-=======
 
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
 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
->>>>>>> 8f3230921e0db7fc1f6198ef62604af9b1e6b833