commit fea76b9ea105f65961d3b9ba34686b6e591ec2c3
author Anthony Sottile <asottile@umich.edu> Mon Feb 03 08:41:48 2020 -0800
committer Anthony Sottile <asottile@umich.edu> Mon Feb 03 08:41:48 2020 -0800
tree d2ffe8b3c72acd14a688b01522abdbeab10e302a
parent 31853d6c43b033713bc71d991f52b2b390a9bffc

Fix CI by upgrading AP templates

pre_commit_hooks/check_merge_conflict.py

diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py
index 74e4ae1..2a03c3a 100644
--- a/pre_commit_hooks/check_merge_conflict.py
+++ b/pre_commit_hooks/check_merge_conflict.py
@@ -41,9 +41,11 @@
             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