From 77f0a2d42093700bec7be34eefe4ab926571c1f5 Mon Sep 17 00:00:00 2001
From: darkbushido <lance.sanchez@gmail.com>
Date: Tue, 2 Sep 2014 19:07:39 -0500
Subject: [PATCH] fixing a merge error with travis.yml

---
 .travis.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9c5cf957c..a808dbc120 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ env:
   - RAKE_TASK=cucumber
   - RAKE_TASK=cucumber:boot
   - RAKE_TASK=spec
+
 language: ruby
 before_install:
   - rake --version
@@ -29,10 +30,3 @@ notifications:
 
 git:
   depth: 5
-
-env:
-  - RAKE_TASK=features
-  - RAKE_TASK=features:boot
-  - RAKE_TASK=spec
-
-script: "bundle exec rake $RAKE_TASK"