fixed merge

diff --git a/README.md b/README.md
index c1a57c9..34d9bad 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@ Yay dotfiles to share
 
 Also includes a script to install it:)
 
-<<<<<<< HEAD
 notes:
 * For msmtp I've patched my msmtp to have the --password flag included using the patch found at https://aur.archlinux.org/packages/msmtp-pwpatched/
 * In bashrc there are two functions concerning encrypted cloud storage, for more info: http://martlubbers.net/nsa-dropbox.html
@@ -20,4 +19,3 @@ Containts:
 
 Todo:
 add offlineimap, msmtp
->>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c

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

diff --git a/muttrc b/muttrc
index de6534c..76c7c4d 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -3,20 +3,8 @@ set realname="Mart Lubbers"
 set from="mart@martlubbers.net"
 set use_from=yes
 set envelope_from=yes
-<<<<<<< HEAD
 set my_msmtp_pass=`gpg --use-agent -d ~/passwd.gpg | grep -i mail | awk '{print $3}'`
 set sendmail="/usr/local/bin/msmtp -C /home/mart/.mutt/msmtp --password=$my_msmtp_pass -f mart@martlubbers.net -a net"
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-set sendmail="/usr/bin/msmtp --passwordeval -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
-=======
-set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
->>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
-=======
-set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
->>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
->>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c
 set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc"
 
 # Macros