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

diff --git a/install b/install
index 9b47660..6f51c0b 100755
--- a/install
+++ b/install
@@ -3,5 +3,11 @@ 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