Bug 1578459 Comment 12 Edit History

Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.

Original comment by
on 
Conflict while grafting:
merging browser/base/content/browser-siteProtections.js
merging browser/components/controlcenter/content/protectionsPanel.inc.xul
warning: conflicts while merging browser/base/content/browser-siteProtections.js! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')

<<<<<<< local
=======
    this._categoryItemOrderInvalidated = true;
    if (["showing", "open"].includes(this._protectionsPopup.state)) {
      this.reorderCategoryItems();
    }

    if (anyDetected) {
      this.noTrackersDetectedDescription.hidden = true;
    }

>>>>>>> graft
    // Check whether the user has added an exception for this site.
    let hasException = ContentBlockingAllowList.includes(
      gBrowser.selectedBrowser
    );
Revision 1 by
on 
Conflict while grafting:
merging browser/base/content/browser-siteProtections.js
merging browser/components/controlcenter/content/protectionsPanel.inc.xul
warning: conflicts while merging browser/base/content/browser-siteProtections.js! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')

<<<<<<< local
    this._categoryItemOrderInvalidated = true;
    if (["showing", "open"].includes(this._protectionsPopup.state)) {
      this.reorderCategoryItems();
    }

    if (anyDetected) {
      this.noTrackersDetectedDescription.hidden = true;
    }

>>>>>>> graft
    // Check whether the user has added an exception for this site.
    let hasException = ContentBlockingAllowList.includes(
      gBrowser.selectedBrowser
    );

Back to Bug 1578459 Comment 12