Merge branch 'master' of https://github.com/dopefishh/dotfiles

[dotfiles.git] / muttrc

diff --git a/muttrc b/muttrc
index 76c7c4d..de6534c 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -3,8 +3,20 @@ 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