Skip to content

G
gitlab-ce
Commit efe0083d authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in app/models/project.rb

parent 103c7d1c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/project.rb
View file @ efe0083d
...@@ -26,12 +26,9 @@ class Project < ActiveRecord::Base ...@@ -26,12 +26,9 @@ class Project < ActiveRecord::Base
include WithUploads include WithUploads
include BatchDestroyDependentAssociations include BatchDestroyDependentAssociations
extend Gitlab::Cache::RequestCache extend Gitlab::Cache::RequestCache
<<<<<<< HEAD
# EE specific modules # EE specific modules
prepend EE::Project prepend EE::Project
=======
>>>>>>> upstream/master
extend Gitlab::ConfigHelper extend Gitlab::ConfigHelper
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7