Skip to content

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

Resolve conflict in app/views/projects/merge_requests/show.html.haml

parent 847ca9d5
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/views/projects/merge_requests/show.html.haml
View file @ 0daf3be9
...@@ -29,11 +29,8 @@ ...@@ -29,11 +29,8 @@
window.gl.mrWidgetData.enable_squash_before_merge = '#{@merge_request.project.feature_available?(:merge_request_squash)}' === 'true'; window.gl.mrWidgetData.enable_squash_before_merge = '#{@merge_request.project.feature_available?(:merge_request_squash)}' === 'true';
window.gl.mrWidgetData.squash_before_merge_help_path = '#{help_page_path("user/project/merge_requests/squash_and_merge")}'; window.gl.mrWidgetData.squash_before_merge_help_path = '#{help_page_path("user/project/merge_requests/squash_and_merge")}';
<<<<<<< HEAD
#js-vue-mr-widget.mr-widget #js-vue-mr-widget.mr-widget
=======
>>>>>>> upstream/master
.content-block.content-block-small.emoji-list-container .content-block.content-block-small.emoji-list-container
= render 'award_emoji/awards_block', awardable: @merge_request, inline: true = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
......
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