Resolve ProjectImportState conflict

2fc8fb6b · Tiago Botelho · dcd9fc0a · 2fc8fb6b
Commit 2fc8fb6b authored May 07, 2018 by Tiago Botelho
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/models/project_import_state.rb app/models/project_import_state.rb +0 -3

No files found.
--- a/app/models/project_import_state.rb
+++ b/app/models/project_import_state.rb
@@ -3,11 +3,8 @@ class ProjectImportState < ActiveRecord::Base

  self.table_name = "project_mirror_data"

-<<<<<<< HEAD
  prepend EE::ProjectImportState

-=======
->>>>>>> upstream/master
  belongs_to :project, inverse_of: :import_state

  validates :project, presence: true