Merge #267

267: Exceptions for bors r=ForsakenHarmony a=ForsakenHarmony Co-authored-by: Leah <me@hrmny.sh>
developit · Dec 17, 2018 · 0013f24 · 0013f24
2 parents 69211a3 + 79501af
commit 0013f24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
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