From a78e9d26cf4ef9da6026be6272c8b416ef318d4d Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 9 Dec 2012 15:26:18 +0100
Subject: [PATCH] remove branch
---
Gemfile | 2 +-
Gemfile.lock | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index b4e07f6f..791d7c80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source :rubygems
gemspec
gem 'travis-support', github: 'travis-ci/travis-support'
-gem 'travis-core', github: 'travis-ci/travis-core', branch: 'sf-rich-states'
+gem 'travis-core', github: 'travis-ci/travis-core'
gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
gem 'unicorn'
diff --git a/Gemfile.lock b/Gemfile.lock
index cdccc2f4..9c1d8f86 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,8 +42,7 @@ GIT
GIT
remote: git://github.com/travis-ci/travis-core.git
- revision: 2e3072e862709c5a1a3daf51abb13adc518e3f14
- branch: sf-rich-states
+ revision: 2afee3dcfe6dfde30a797646e9772c397cd8d040
specs:
travis-core (0.0.1)
actionmailer (~> 3.2.3)
@@ -266,7 +265,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
- unicorn (4.4.0)
+ unicorn (4.5.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)