From b55581dfe35040a4fdc93a1f38c1e1769d4d2535 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Mon, 16 Apr 2018 21:27:02 +0200
Subject: bors-ng integration

---
 .travis.yml | 5 ++---
 bors.toml   | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 bors.toml

diff --git a/.travis.yml b/.travis.yml
index 59a66b4..2972690 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,9 +60,8 @@ before_cache:
 
 branches:
   only:
-    - auto
-    - master
-    - try
+    - staging
+    - trying
 
 notifications:
   email:
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..5ccee21
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,3 @@
+status = [
+  "continuous-integration/travis-ci/push",
+]
\ No newline at end of file
-- 
cgit v1.2.3