Skip to content

Commit

Permalink
fix merge conflict weirdness
Browse files Browse the repository at this point in the history
  • Loading branch information
jasperhuangg committed Jul 1, 2024
1 parent 284496a commit d8e64e8
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/libs/EmojiUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ const findEmojiByName = (name: string): Emoji => Emojis.emojiNameTable[name];

const findEmojiByCode = (code: string): Emoji => Emojis.emojiCodeTableWithSkinTones[code];

const findEmojiByName = (name: string): Emoji => Emojis.emojiNameTable[name];

const findEmojiByCode = (code: string): Emoji => Emojis.emojiCodeTableWithSkinTones[code];

let frequentlyUsedEmojis: FrequentlyUsedEmoji[] = [];
Onyx.connect({
key: ONYXKEYS.FREQUENTLY_USED_EMOJIS,
Expand Down

0 comments on commit d8e64e8

Please sign in to comment.