Merge branch 'master' into ranger

2015-04-06 03:21:52 -04:00 · 2015-04-06 03:21:52 -04:00 · 4919d58313
commit 4919d58313
parent 12ccd47838 04c707014a
2 changed files with 1 additions and 3 deletions
--- a/i3/i3.dotfile/passmenu
+++ b/i3/i3.dotfile/passmenu
@ -27,5 +27,3 @@ else
 	fi
 	xdotool - <<<"type --clearmodifiers -- $(pass show "$password" | head -n 1)"
 fi
-
-
--- a/zprezto/.zprezto
+++ b/zprezto/.zprezto
@ -1 +1 @@
-Subproject commit b7d096df9f46042171ba0163ae3f9f3e395ad535
+Subproject commit c65c9e96591a16d70fb3c668c25b7d1715ab97ad