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

diff --git a/README.md b/README.md
index dc2e95a..c1a57c9 100644
--- a/README.md
+++ b/README.md
@@ -3,5 +3,21 @@ 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
+- Xresources with nice colorscheme and transparant terminals
+- bashrc
+- muttrc
+
 Todo:
-add mutt, offlineimap, msmtp, Xresources, i3
+add offlineimap, msmtp
+>>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c