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

diff --git a/README.md b/README.md
index 549c6b6..c1a57c9 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,14 @@ 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
+
+TODO:
+* screen, irssi
+=======
 Containts:
 - vimrc
 - i3 config including custom bar and lock
@@ -12,3 +20,4 @@ Containts:
 
 Todo:
 add offlineimap, msmtp
+>>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c