Remove leftover <<<HEAD from conflict resolution of schema.db

9ff71957 · Tiago Botelho · c37b0461 · 9ff71957
Commit 9ff71957 authored May 07, 2018 by Tiago Botelho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

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

No files found.
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1988,7 +1988,6 @@ ActiveRecord::Schema.define(version: 20180503175054) do
  end
  add_index "project_mirror_data", ["jid"], name: "index_project_mirror_data_on_jid", using: :btree
-<<<<<<< HEAD
  add_index "project_mirror_data", ["last_successful_update_at"], name: "index_project_mirror_data_on_last_successful_update_at", using: :btree
  add_index "project_mirror_data", ["next_execution_timestamp", "retry_count"], name: "index_mirror_data_on_next_execution_and_retry_count", using: :btree
  add_index "project_mirror_data", ["project_id"], name: "index_project_mirror_data_on_project_id", unique: true, using: :btree