diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-07-05 21:37:14 -0400 |
| commit | 06bf25405c98257e47953b5d3c327e314ea371b3 (patch) | |
| tree | 81be5b612621bdd74f632dbedb9f85c4d1d203b9 /.travis/check-git-clang-format-output.sh | |
| parent | 282cae4a9fbd019a973fb6618337d29a61f97f42 (diff) | |
| parent | be05c5bd52769b58316986bd7451cb2483571099 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
include/use_pokeblock.h
Diffstat (limited to '.travis/check-git-clang-format-output.sh')
| -rwxr-xr-x | .travis/check-git-clang-format-output.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis/check-git-clang-format-output.sh b/.travis/check-git-clang-format-output.sh index e6acf8ced..c53efa726 100755 --- a/.travis/check-git-clang-format-output.sh +++ b/.travis/check-git-clang-format-output.sh @@ -17,5 +17,5 @@ if [ "$output" == "no modified files to format" ] || [ "$output" == "clang-forma else echo "clang-format failed:" echo "$output" | colordiff - exit 0 + exit 1 fi |