From f9d2d2de3648f2168ba533a3e2e729c5a4bdc0f5 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Tue, 24 Feb 2015 16:27:46 +0100
Subject: [PATCH] switch travis-core back to master

---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index f8996a0c..8aa43451 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ ruby '2.1.2' if ENV.key?('DYNO')
 
 gem 's3',              github: 'travis-ci/s3'
 
-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'rkh-branches' # TODO: revert to master
+gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil
diff --git a/Gemfile.lock b/Gemfile.lock
index 4dcc389b..7b0c1e3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,8 +50,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 3adf0cd02db39c78245d5987f2efe34d336b2e70
-  branch: rkh-branches
+  revision: 3c031d6fb8dbbb415e5d2ef3b2af68a80d361933
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)