merge conflict with mdn/master

This commit is contained in:
iampeterbanjo
2016-11-16 19:44:50 +00:00
2 changed files with 3 additions and 3 deletions

View File

@@ -2,8 +2,8 @@
## What it does
Replaces words that describe an emoji with the emoji itself.
Replaces words that describe an emoji with the emoji itself. This runs as a content script and scans web pages, looking for text that can be replaced with emoji. As an example, after installing visit https://mozilla.org and notice that the text "firefox" should change.
## What it shows
A good example for beginners that can be used as a "make your first add-on" tutorial and / or referenced to create other add-ons.
A good example for beginners that can be used as a "make your first add-on" tutorial and / or referenced to create other add-ons.

View File

@@ -56,7 +56,7 @@ document.addEventListener("click", function(e) {
}
}
});
}
}
if (e.target.id === "tabs-move-beginning") {
callOnActiveTab((tab, tabs) => {