Merge #267

bors[bot] · ForsakenHarmony · bors[bot] · commit 0013f24e9a8b · 2018-12-17T21:58:29.000Z
267: Exceptions for bors r=ForsakenHarmony a=ForsakenHarmony



Co-authored-by: Leah &lt;me@hrmny.sh&gt;
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,7 @@
 language: node_js
 node_js:
   - "node"
+branches:
+  except:
+  - trying.tmp
+  - staging.tmp
diff --git a/bors.toml b/bors.toml
@@ -0,0 +1,4 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]
+delete_merged_branches = true
