Fixup version

arista-eosplus · Feb 16, 2016 · 762eeae · 762eeae
1 parent 93fd50a
commit 762eeae
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -24,11 +24,7 @@ group :development, :test do
   gem 'pry',                     require: false
   gem 'pry-doc',                 require: false
   gem 'pry-stack_explorer',      require: false
-<<<<<<< HEAD
   gem 'rbeapi', '0.5.1', path: '.'
-=======
-  gem 'rbeapi', '0.5.0', path: '.'
->>>>>>> Bump version strings
   gem 'ci_reporter_rspec',       require: false
   gem 'simplecov-json',          require: false
   gem 'simplecov-rcov',          require: false