Commit efe0083d authored by Stan Hu's avatar Stan Hu

Resolve conflicts in app/models/project.rb

parent 103c7d1c
......@@ -26,12 +26,9 @@ class Project < ActiveRecord::Base
include WithUploads
include BatchDestroyDependentAssociations
extend Gitlab::Cache::RequestCache
<<<<<<< HEAD
# EE specific modules
prepend EE::Project
=======
>>>>>>> upstream/master
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