Resolve conflicts in db/schema.rb

4d426011 · Bob Van Landuyt · fde8e44d · 4d426011
Commit 4d426011 authored Mar 08, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1535,10 +1535,6 @@ 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"
-=======
->>>>>>> master
    t.boolean "allow_maintainer_to_push"
  end