This repository has been archived by the owner on Oct 3, 2018. It is now read-only.

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

Closed

katydecorah opened this issue Sep 24, 2014 · 1 comment

Labels

bug

katydecorah commented Sep 24, 2014

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

emojify.css
emojify.min.css
emojify.min.js

hassankhan closed this as completed in

dce18b2

Contributor

hassankhan commented Sep 26, 2014

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.

hassankhan added the bug label

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.