Fix merge errors

This commit is contained in:
Marty Oehme 2019-07-24 10:42:12 +02:00
parent ef73a11e51
commit 05c189cfa4
2 changed files with 3 additions and 3 deletions

View file

@ -27,8 +27,8 @@ else
fi
# set up fuzzy file and directory search
alias f="fzf -c 'find . -type f' --preview='"'head -$LINES {}'"' | xargs xdg-open"
alias F="fzf -c 'find ~ -type f' --preview='"'head -$LINES {}'"' | xargs xdg-open"
alias f="fzf -c 'find . -type f' --preview='"'head -$LINES {}'"' | xargs -0 xdg-open"
alias F="fzf -c 'find ~ -type f' --preview='"'head -$LINES {}'"' | xargs -0 xdg-open"
alias d="fzf -c 'find . -type d' --preview='ls --color='always' {}' | cd"
alias D="fzf -c 'find ~ -type d' --preview='ls --color='always' {}' --color=dark --ansi | cd"

View file

@ -4,4 +4,4 @@
# https://github.com/swalladge/dotfiles/blob/master/local/share/qutebrowser/userscripts/wallabag_add.sh
# v2.*
echo "open https://read.martyoeh.me/bookmarklet?url=$QUTE_URL" >> "$QUTE_FIFO"
echo "open https://read.martyoeh.me/bookmarklet?url=$QUTE_URL" >>"$QUTE_FIFO"