Resolve conflicts in db/schema.rb

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6615 introduced
changes that shouldn't have been merged, but this conflict was a
shortcoming of a prior CE->EE merge.

db/schema.rb

@@ -3384,13 +3384,8 @@ ActiveRecord::Schema.define(version: 20181017131623) do
   add_foreign_key "u2f_registrations", "users"
   add_foreign_key "user_callouts", "users", on_delete: :cascade
   add_foreign_key "user_custom_attributes", "users", on_delete: :cascade
-<<<<<<< HEAD
-  add_foreign_key "user_interacted_projects", "projects", on_delete: :cascade
-  add_foreign_key "user_interacted_projects", "users", on_delete: :cascade
-=======
   add_foreign_key "user_interacted_projects", "projects", name: "fk_722ceba4f7", on_delete: :cascade
   add_foreign_key "user_interacted_projects", "users", name: "fk_0894651f08", on_delete: :cascade
->>>>>>> upstream/master
   add_foreign_key "user_preferences", "users", on_delete: :cascade
   add_foreign_key "user_statuses", "users", on_delete: :cascade
   add_foreign_key "user_synced_attributes_metadata", "users", on_delete: :cascade