Skip to content

G
gitlab-ce
Commit fc31da4c authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in spec/factories/appearances.rb 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent b831b6de
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
spec/factories/appearances.rb
View file @ fc31da4c
...@@ -2,13 +2,8 @@ ...@@ -2,13 +2,8 @@
FactoryGirl.define do FactoryGirl.define do
factory :appearance do factory :appearance do
<<<<<<< HEAD
title "GitLab Enterprise Edition" title "GitLab Enterprise Edition"
description "Open source software to collaborate on code" description "Open source software to collaborate on code"
=======
title "MepMep"
description "This is my Community Edition instance"
>>>>>>> upstream/master
new_project_guidelines "Custom project guidelines" new_project_guidelines "Custom project guidelines"
end end
end end
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