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

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