summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_request/merge_status/cannot_be_merged.js.es6
blob: 7ffd9ed409525e3904d893ee7274a4836d30bf3c (plain)
1
2
3
4
5
6
7
8
9
10
const mergeStatusCannotBeMerged = {
  template: ` <h4 class="has-conflicts">
                <i class="fa fa-exclamation-triangle"></i>
                This merge request contains merge conflicts
              </h4>
              <p>
                Please resolve these conflicts or
                <a class="how_to_merge_link vlink" data-toggle="modal" href="#modal_merge_info">merge this request manually</a>.
              </p>`
};