commit 299c753d4374689d249e145d6338313d624e1d05 Author: Matthew Finkel sysrqb@torproject.org Date: Thu Jan 28 14:34:52 2021 +0000

fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/base/content/browser-menubar.inc | 1 - 1 file changed, 1 deletion(-)

diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index b2680c72fbd7..dbb409345140 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -516,7 +516,6 @@ appmenu-data-l10n-id="appmenu-help-keyboard-shortcuts"/> <menuitem id="troubleShooting" oncommand="openTroubleshootingPage()" -<<<<<<< HEAD onclick="checkForMiddleClick(this, event);" data-l10n-id="menu-help-troubleshooting-info"/> <!-- <menuitem id="feedbackPage"