X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=install;h=5423b0ccc026434652d94961bc0b4f0d668dfb13;hb=f78a33dc565ee9cff3f1ae4d4119758997323691;hp=6f51c0b3afd3072ee78014d62a6aacac6ee8caa3;hpb=5223e76a4302c4de131593feea3987398c60445d;p=dotfiles.git

diff --git a/install b/install
index 6f51c0b..5423b0c 100755
--- 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