From e0394c65514865e7e5e4831398f0961cf8e726d4 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 11 Apr 2018 17:00:31 -0700
Subject: [PATCH] no merge and quiet

---
 .travis.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6767164c2..1072032a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ before_install:
   # This is because we want test-everything to test the code in master nightly
   # in a Travis cron, but with a different set of tests than master has
   # in .travis.yml.
-  - cp .travis.yml /tmp/travis.yml
-  - git pull origin master --strategy=recursive --strategy-option=theirs --no-edit
-  - if ! git diff .travis.yml /tmp/travis.yml ; then echo "Please merge master into test-everything"; exit 1; fi
   - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas && brew upgrade python python3 && brew link python)'
 
 before_script:
@@ -145,9 +142,3 @@ after_success: '[ "$TOXENV" == "cover" ] && coveralls'
 
 notifications:
   email: false
-  irc:
-    channels:
-      - secure: "SGWZl3ownKx9xKVV2VnGt7DqkTmutJ89oJV9tjKhSs84kLijU6EYdPnllqISpfHMTxXflNZuxtGo0wTDYHXBuZL47w1O32W6nzuXdra5zC+i4sYQwYULUsyfOv9gJX8zWAULiK0Z3r0oho45U+FR5ZN6TPCidi8/eGU+EEPwaAw="
-    on_success: never
-    on_failure: always
-    use_notice: true