Resolve conflicts in `db/schema.rb`

f8fdb263 · Bob Van Landuyt · d10aaa07 · f8fdb263
Commit f8fdb263 authored Mar 08, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

db/schema.rb db/schema.rb +0 -3

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1531,11 +1531,8 @@ ActiveRecord::Schema.define(version: 20180307164427) do
    t.string "merge_jid"
    t.boolean "discussion_locked"
    t.integer "latest_merge_request_diff_id"
-<<<<<<< HEAD
-=======
    t.string "rebase_commit_sha"
    t.boolean "allow_maintainer_to_push"
->>>>>>> upstream/master
  end

  add_index "merge_requests", ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree