From 6a38c0b2ebb7366c223b65e4ac590e3c6b4485cd Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Thu, 24 Sep 2015 18:34:35 -0300
Subject: [PATCH] remove fix merge issu on Gemfile

---
 Gemfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index d44c0b6..e6e0b31 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,8 +47,7 @@ group :cucumber do
   gem 'capybara',               '~> 2.1.0'
   gem 'cucumber',               '~> 1.0.6'
   gem 'database_cleaner',       '~> 1.2.0'
-  gem 'selenium-webdriver',     '~> 2.47.1'
-  gem 'launchy'
+  gem 'selenium-webdriver',     '~> 2.39.0'
 end
 
 # Requires custom dependencies
--
libgit2 0.21.2