search

joypixels / emojify.js

A Javascript module to convert Emoji keywords to images
http://hassankhan.github.io/emojify.js/
MIT License
1.8k stars 238 forks source link

emojify.css/js pushed with unresolved merge conflicts #69

Closed katydecorah closed 10 years ago

katydecorah commented 10 years ago

Hi there, just wanted to give a heads up that the following files were pushed with unresolved merge conflicts:

hassankhan commented 10 years ago

Thanks, let me know if this fixes the problem. I've been having issues with line-endings lately, so that may have been the reason.