fix merge conflicts

2017-05-14 16:17:04 +01:00
parent 30035ce1c2 f202602f99
commit bc8a5916d8
2 changed files with 8 additions and 8 deletions
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@ -10,7 +10,7 @@ group_defaults:
  reset_on_push:
    enabled: true
  reject_value: -2
-  approve_regex: '^(Approved|:shipit:|:\+1:|Engage)'
+  approve_regex: '^(Approved|:shipit:|:\+1:|Engage|:taco:)'
  reject_regex: '^(Rejected|:-1:|Borg)'
  author_approval:
    auto: true