Merge branch 'master' into feature/soap-test

# Conflicts:
#	scripts/check.sh
This commit is contained in:
Filip Bucek 2019-11-08 13:32:59 +01:00
commit ea0258cef1

View File

@ -10,7 +10,7 @@ cd $SOURCE_DIR
info "Checking line ending" info "Checking line ending"
RESULT=$( find . -not -type d ! -path '.git' -exec file "{}" ";" | grep "ASCII text, with CRLF" | cat ) RESULT=$( find . -not -type d ! -path '*.git/*' -exec file "{}" ";" | grep "ASCII text, with CRLF" | cat )
if [ ! -z "$RESULT" ]; then if [ ! -z "$RESULT" ]; then
echo "----------------------------------" echo "----------------------------------"