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

diff --git a/README.md b/README.md
index c1a57c9..91acfcb 100644
--- a/README.md
+++ b/README.md
@@ -3,21 +3,7 @@ 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