From 762eeae194a55f18f455cfae19bd1d6cdabb747a Mon Sep 17 00:00:00 2001
From: Jere Julian <jere@arista.com>
Date: Mon, 8 Feb 2016 14:28:15 -0500
Subject: [PATCH] Fixup version

---
 Gemfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 611e5f7..db3a9d1 100644
--- 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