diff --git a/config/environments/cucumber.rb b/config/environments/cucumber.rb
index da5f870..489237d 100644
--- a/config/environments/cucumber.rb
+++ b/config/environments/cucumber.rb
@@ -18,8 +18,6 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
-<<<<<<< HEAD
-=======
 
 config.gem 'cucumber',    :lib => false,        :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
 config.gem 'webrat',      :lib => false,        :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
@@ -28,4 +26,3 @@ config.gem 'rspec-rails', :lib => 'spec/rails',        :version => '1.2.9' unles
 config.gem 'Selenium',    :lib => 'selenium',      :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))
 config.gem 'selenium-client',    :lib => 'selenium/client',      :version => '>= 1.2.17' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
 config.gem 'database_cleaner', :lib => 'database_cleaner'
->>>>>>> noosfero-bsc/solr-merge
--
libgit2 0.21.2