X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=muttrc;h=76c7c4da40a8f9c8851c4ce6f6e91922dae81199;hb=f78a33dc565ee9cff3f1ae4d4119758997323691;hp=de6534c0e7697bcec677c70b078935ab81498304;hpb=5223e76a4302c4de131593feea3987398c60445d;p=dotfiles.git

diff --git a/muttrc b/muttrc
index de6534c..76c7c4d 100644
--- 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