X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=README.md;h=34d9bad12adb4b3736f1173c41b7a5e491354253;hb=f78a33dc565ee9cff3f1ae4d4119758997323691;hp=c1a57c982e0307e21ab10b1d97e876b7f09ecccf;hpb=5223e76a4302c4de131593feea3987398c60445d;p=dotfiles.git

diff --git a/README.md b/README.md
index c1a57c9..34d9bad 100644
--- 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