| commit | 2a902e0a073647334076360bad571477aea1f1cf | [log] [tgz] |
|---|---|---|
| author | Anthony Sottile <asottile@umich.edu> | Wed Jul 12 18:35:24 2017 -0700 |
| committer | Anthony Sottile <asottile@umich.edu> | Wed Jul 12 18:58:30 2017 -0700 |
| tree | 402514f94a08a6f03d6d9954fabb7a82f1e55c5e | |
| parent | 286962eeb7af67f321b94a22e8edbd3004b1810e [diff] [blame] |
Use asottile/add-trailing-comma
diff --git a/pre_commit_hooks/check_merge_conflict.py b/pre_commit_hooks/check_merge_conflict.py index 7d87efc..5035b6d 100644 --- a/pre_commit_hooks/check_merge_conflict.py +++ b/pre_commit_hooks/check_merge_conflict.py
@@ -7,7 +7,7 @@ b'<<<<<<< ', b'======= ', b'=======\n', - b'>>>>>>> ' + b'>>>>>>> ', ] WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'