fixed merge

[dotfiles.git] / install

diff --git a/install b/install
index 6f51c0b..5423b0c 100755 (executable)
--- a/install
+++ b/install
@@ -3,11 +3,9 @@ cp -if `pwd`/.vimrc ~/.vimrc
 cp -if `pwd`/.bashrc ~/.bashrc
 cp -if `pwd`/.Xresources ~/.Xresources
 cp -if `pwd`/muttrc ~/.mutt/muttrc
-<<<<<<< HEAD
 cp -if `pwd`/msmtp ~/.mutt/msmtp
 cp -if `pwd`/offlineimaprc ~/.mutt/offlineimaprc
-=======
+
 mkdir -p ~/.i3
 cp -if `pwd`/i3/* ~/.i3/
 cp -if `pwd`/.xinitrc ~/.xinitrc
->>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c