Skip to content

G
gitlab-ce
Commit b30bc118 authored by Clement Ho's avatar Clement Ho
Browse files
Options

Fix conflict in app/views/admin/conversational_development_index/show.html.haml

parent 56bcaf86
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/views/admin/conversational_development_index/show.html.haml
View file @ b30bc118
...@@ -25,11 +25,7 @@ ...@@ -25,11 +25,7 @@
- @metric.cards.each do |card| - @metric.cards.each do |card|
= render 'card', card: card = render 'card', card: card
<<<<<<< HEAD
.convdev-steps.d-none.d-lg-block
=======
.convdev-steps.d-none.d-lg-block.d-xl-block .convdev-steps.d-none.d-lg-block.d-xl-block
>>>>>>> gitlab-ce/master
- @metric.idea_to_production_steps.each_with_index do |step, index| - @metric.idea_to_production_steps.each_with_index do |step, index|
.convdev-step{ class: "convdev-#{score_level(step.percentage_score)}-score" } .convdev-step{ class: "convdev-#{score_level(step.percentage_score)}-score" }
= custom_icon("i2p_step_#{index + 1}") = custom_icon("i2p_step_#{index + 1}")
......
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