Merge conflict resolution

2016-09-21 17:20:25 -07:00
parent 521374e238 ac8d295bb9
commit a0d47be088
7 changed files with 89 additions and 139 deletions
@@ -12,3 +12,8 @@ reviewers:
  - PromoFaux
  name: pullapprove
  required: 3
+always_pending:
+  title_regex: '(WIP|wip)'
+  labels:
+    - wip
+  explanation: 'This PR is a work in progress...'