Merge branch 'master' of https://github.com/dopefishh/dotfiles

[dotfiles.git] / README.md

diff --git a/README.md b/README.md
index 549c6b6..c1a57c9 100644 (file)
--- 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