Resolve conflicts in app/models/project.rb

e931893e · Stan Hu · a2003f2f · e931893e
Commit e931893e authored May 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -23,12 +23,9 @@ class Project < ActiveRecord::Base
  include ::Gitlab::Utils::StrongMemoize
  include ChronicDurationAttribute
  include FastDestroyAll::Helpers
-<<<<<<< HEAD

  # EE specific modules
  prepend EE::Project
-=======
->>>>>>> upstream/master

  extend Gitlab::ConfigHelper