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