diff options
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index 28ba2b6ac75..a7ffe825139 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -1,4 +1,5 @@ - page_title _("Merge Conflicts"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge Requests") +- add_page_specific_style 'page_bundles/merge_conflicts' - content_for :page_specific_javascripts do = page_specific_javascript_tag('lib/ace.js') = render "projects/merge_requests/mr_title" |