Fix CI by upgrading AP templates

2026-04-10 21:34:18 +00:00 · 2020-02-03 08:41:48 -08:00 · 2020-02-03 08:41:48 -08:00 · fea76b9ea1
commit fea76b9ea1
parent 31853d6c43
8 changed files with 39 additions and 34 deletions
--- a/pre_commit_hooks/check_merge_conflict.py
+++ b/pre_commit_hooks/check_merge_conflict.py
@ -41,9 +41,11 @@ def main(argv=None):  # type: (Optional[Sequence[str]]) -> int
            for i, line in enumerate(inputfile):
                for pattern in CONFLICT_PATTERNS:
                    if line.startswith(pattern):
-                        print(WARNING_MSG.format(
-                            pattern.decode(), filename, i + 1,
-                        ))
+                        print(
+                            WARNING_MSG.format(
+                                pattern.decode(), filename, i + 1,
+                            ),
+                        )
                        retcode = 1

    return retcode