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

diff --git a/README.md b/README.md
index ef8be03..c1a57c9 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,22 @@ 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 offlineimap, msmtp
+>>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c