added load

[dotfiles.git] / muttrc

diff --git a/muttrc b/muttrc
index 4c4fe7e..df48b41 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -3,7 +3,15 @@ set realname="Mart Lubbers"
 set from="mart@martlubbers.net"
 set use_from=yes
 set envelope_from=yes
+<<<<<<< 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
 set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc"
 
 # Force offlineimap to refresh in the background