Merge conflict

precommit-hooks/find-passwords-in-files

@@ -32,7 +32,6 @@ IFS="
 "
 
 for i in `ansible-vault decrypt --output - ${ANSIBLE_VAULT_FILE} | sed 's/\s\?-\?\s\?[A-Za-z0-9_]\+://' | grep -vE '\||password|^\s\?$|#|https://' | sed "s/^ \+['\"]\?//" | sed "s/[\"']\s\?//" | sort | uniq`; do
-
     grep -rlF "${i}" .
     if [ $? -ne 1 ]; then
         echo "A secret starting with $(echo "$i" | cut -c 1-7) was found in the files above."