Resolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
 ActiveRecord::Schema.define(version: 20170516183131) do
-=======
-ActiveRecord::Schema.define(version: 20170512173638) do
->>>>>>> origin/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -290,11 +290,7 @@ describe Projects::MergeRequestsController do
 
           recorded = ActiveRecord::QueryRecorder.new { go(format: :json) }
 
-<<<<<<< HEAD
-          expect(recorded.count).to be_within(3).of(100)
-=======
           expect(recorded.count).to be_within(5).of(95)
->>>>>>> origin/master
           expect(recorded.cached_count).to eq(0)
         end
       end