resolve merge conflict

spec/rails_helper.rb

@@ -1,11 +1,7 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 require 'spec_helper'
 ENV['RAILS_ENV'] ||= 'test'
-<<<<<<< HEAD
 require File.expand_path('../config/environment', __dir__)
-=======
-require_relative '../config/environment'
->>>>>>> my-02-setup
 # Prevent database truncation if the environment is production
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'rspec/rails'
@@ -31,12 +27,8 @@
 begin
   ActiveRecord::Migration.maintain_test_schema!
 rescue ActiveRecord::PendingMigrationError => e
-<<<<<<< HEAD
   puts e.to_s.strip
   exit 1
-=======
-  abort e.to_s.strip
->>>>>>> my-02-setup
 end
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
@@ -62,11 +54,7 @@
   #     end
   #
   # The different available types are documented in the features, such as in
-<<<<<<< HEAD
   # https://relishapp.com/rspec/rspec-rails/docs
-=======
-  # https://rspec.info/features/6-0/rspec-rails
->>>>>>> my-02-setup
   config.infer_spec_type_from_file_location!
 
   # Filter lines from Rails gems in backtraces.

spec/spec_helper.rb

@@ -12,11 +12,7 @@
 # the additional setup, and require it from the spec files that actually need
 # it.
 #
-<<<<<<< HEAD
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-=======
-# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
->>>>>>> my-02-setup
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -65,13 +61,9 @@
 
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
-<<<<<<< HEAD
   #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
   #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-=======
-  # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
->>>>>>> my-02-setup
   config.disable_monkey_patching!
 
   # Many RSpec users commonly either run the entire suite or an individual