Resolve conflicts in database files

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.js

@@ -12,11 +12,7 @@ export default {
     <div class="mr-widget-body media">
       <status-icon
         status="failed"
-<<<<<<< HEAD
-        showDisabledButton />
-=======
         :show-disabled-button="true" />
->>>>>>> ce/master
       <div class="media-body space-children">
         <span
           v-if="mr.shouldBeRebased"

db/migrate/20141126120926_add_merge_request_rebase_enabled_to_projects.rb

 # rubocop:disable all
 class AddMergeRequestRebaseEnabledToProjects < ActiveRecord::Migration
-<<<<<<< HEAD
-  def change
-    add_column :projects, :merge_requests_rebase_enabled, :boolean, default: false
-=======
   include Gitlab::Database::MigrationHelpers
 
   # Set this constant to true if this migration requires downtime.
@@ -17,6 +13,5 @@ class AddMergeRequestRebaseEnabledToProjects < ActiveRecord::Migration
 
   def down
     remove_column(:projects, :merge_requests_rebase_enabled)
->>>>>>> ce/master
   end
 end

db/migrate/20150827121444_add_fast_forward_option_to_project.rb

 # rubocop:disable all
 class AddFastForwardOptionToProject < ActiveRecord::Migration
-<<<<<<< HEAD
-  def change
-    add_column :projects, :merge_requests_ff_only_enabled, :boolean, default: false
-=======
   include Gitlab::Database::MigrationHelpers
 
   # Set this constant to true if this migration requires downtime.
@@ -19,6 +15,5 @@ class AddFastForwardOptionToProject < ActiveRecord::Migration
     if column_exists?(:projects, :merge_requests_ff_only_enabled)
       remove_column(:projects, :merge_requests_ff_only_enabled)
     end
->>>>>>> ce/master
   end
 end

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: 20171002105019) do
-=======
 ActiveRecord::Schema.define(version: 20171004121444) do
->>>>>>> ce/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1526,12 +1522,6 @@ ActiveRecord::Schema.define(version: 20171004121444) do
     t.boolean "disable_overriding_approvers_per_merge_request"
     t.integer "storage_version", limit: 2
     t.boolean "resolve_outdated_diff_discussions"
-<<<<<<< HEAD
-=======
-    t.boolean "repository_read_only"
-    t.boolean "merge_requests_ff_only_enabled", default: false
-    t.boolean "merge_requests_rebase_enabled", default: false, null: false
->>>>>>> ce/master
   end
 
   add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree