From 0ca5bda71a45881789a4a4d481ac205208d31993 Mon Sep 17 00:00:00 2001
From: Lauren Tan <laurent@netflix.com>
Date: Sun, 3 Mar 2019 15:47:15 -0800
Subject: [PATCH] Update travis config and add bors.toml

---
 .travis.yml | 6 ++++++
 bors.toml   | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 bors.toml

diff --git a/.travis.yml b/.travis.yml
index 1e60398..ef2f9ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,3 +17,9 @@ install:
 
 script:
   - yarn test
+
+branches:
+  only:
+    - master
+    - staging # This is where pull requests from "bors r+" are built.
+    - trying # This is where pull requests from "bors try" are built.
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000..81e394a
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,6 @@
+status = [
+  "continuous-integration/travis-ci/push"
+]
+# Uncomment this to use a two hour timeout.
+# The default is one hour.
+#timeout_sec = 7200