Merge branch 'master' of github.com:warpling/Macmoji

forklifters · Dec 15, 2016 · d6b144f · d6b144f
2 parents ba9b557 + c90aa10
commit d6b144f
Show file tree

Hide file tree

Showing 3 changed files with 469 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,11 @@ Some fun recommendations:
 | eml | [email protected] |
 
 #### 💩 Why the colons?
+<<<<<<< HEAD
 Well it's what [Slack](https://get.slack.help/hc/en-us/articles/202931348-Emoji-and-emoticons)/GitHub/Trello does *and* it prevents macOS's autocomplete from being too aggressive when you're just trying to type normal sentences like, "ghost bananas are cool." 👻🍌🆒
+=======
+Well it's [what Slack does](https://get.slack.help/hc/en-us/articles/202931348-Emoji-and-emoticons) *and* it prevents macOS's autocomplete from being too aggressive when you're just trying to type normal sentences like, "ghost bananas are cool." 👻🍌🆒
+>>>>>>> c90aa107227bc8e3d80a237527144b79341da8f5
 
 #### 🖐🏽 What about skin tones?
 Type your skin-tonable emoji, then type `:skin-tone-3:` (any number 1-5) to add the skintone. They should combine!