Resolve conflicts in db/schema.rb

067adfd2 · Stan Hu · 30e84d21 · 067adfd2
Commit 067adfd2 authored Mar 08, 2018 by Stan Hu
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
@@ -2616,12 +2616,8 @@ ActiveRecord::Schema.define(version: 20180308052825) do
  add_foreign_key "cluster_providers_gcp", "clusters", on_delete: :cascade
  add_foreign_key "clusters", "users", on_delete: :nullify
  add_foreign_key "clusters_applications_helm", "clusters", on_delete: :cascade
-<<<<<<< HEAD
-  add_foreign_key "clusters_applications_ingress", "clusters", on_delete: :cascade
-=======
  add_foreign_key "clusters_applications_ingress", "clusters", name: "fk_753a7b41c1", on_delete: :cascade
  add_foreign_key "clusters_applications_prometheus", "clusters", name: "fk_557e773639", on_delete: :cascade
->>>>>>> upstream/master
  add_foreign_key "clusters_applications_runners", "ci_runners", column: "runner_id", name: "fk_02de2ded36", on_delete: :nullify
  add_foreign_key "clusters_applications_runners", "clusters", on_delete: :cascade
  add_foreign_key "container_repositories", "projects"