gem

Gemfile

@@ -31,15 +31,9 @@ gem 'bootsnap', '>= 1.4.4', require: false
 group :development, :test do
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
-<<<<<<< HEAD
-  gem 'pry-rails', '~> 0.3.9'
-  # gem 'pry-nav', '~> 0.3.0'
-  gem 'pry', '~> 0.14.1'
-=======
   gem 'pry', '~> 0.14.1'
   gem 'pry', '~> 0.14.1'
   # gem 'pry-nav'
   # gem 'pry-nav'
   gem 'pry-rails'
   gem 'pry-rails'
->>>>>>> master
 end
 end
 
 
 group :development do
 group :development do