Skip to content

G
gitlab-ce
Commit 3025eb0f authored by Yorick Peterse's avatar Yorick Peterse
Browse files
Options

Fixed EE prepend conflicts for enums

parent c21165d0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
app/models/ci/pipeline_enums.rb
View file @ 3025eb0f
...@@ -26,8 +26,5 @@ module Ci ...@@ -26,8 +26,5 @@ module Ci
end end
end end
end end
<<<<<<< HEAD
Ci::PipelineEnums.prepend(EE::Ci::PipelineEnums) Ci::PipelineEnums.prepend(EE::Ci::PipelineEnums)
=======
>>>>>>> upstream/master
app/models/commit_status_enums.rb
View file @ 3025eb0f
...@@ -18,8 +18,5 @@ module CommitStatusEnums ...@@ -18,8 +18,5 @@ module CommitStatusEnums
} }
end end
end end
<<<<<<< HEAD
CommitStatusEnums.prepend(EE::CommitStatusEnums) CommitStatusEnums.prepend(EE::CommitStatusEnums)
=======
>>>>>>> upstream/master
app/models/user_callout_enums.rb
View file @ 3025eb0f
...@@ -14,8 +14,5 @@ module UserCalloutEnums ...@@ -14,8 +14,5 @@ module UserCalloutEnums
} }
end end
end end
<<<<<<< HEAD
UserCalloutEnums.prepend(EE::UserCalloutEnums) UserCalloutEnums.prepend(EE::UserCalloutEnums)
=======
>>>>>>> upstream/master
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