Reverse merge master into add-style

JasonEtco · JasonEtco · commit 28e7882e1806 · 2018-07-23T14:40:09.000-04:00
diff --git a/config.yml b/config.yml
@@ -262,6 +262,9 @@ steps:
     actions:
       - type: gate
         left: '%payload.pull_request.merged%'
+      - type: mergeBranch
+        head: master
+        base: add-style
       - type: createPullRequest
         title: Add some style to your page
         head: add-style
