Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add omggif as dependency rather than file #467

Merged
merged 2 commits into from
Jul 23, 2018
Merged

add omggif as dependency rather than file #467

merged 2 commits into from
Jul 23, 2018

Conversation

hipstersmoothie
Copy link
Collaborator

No description provided.

@hipstersmoothie
Copy link
Collaborator Author

@edi9999 any comments?

@edi9999
Copy link
Contributor

edi9999 commented Jul 23, 2018

Looks good to me, but has conflicts now.

@hipstersmoothie
Copy link
Collaborator Author

@edi9999

  • fixed merge conflicts
  • noticed that index.js was indented wrong and i think i was because of clashing tab widths in prettier and editorconfig. so i set prettier's tab width to 4 to match and reformatted index.js

@edi9999
Copy link
Contributor

edi9999 commented Jul 23, 2018

Yes, looks good to me !

@edi9999 edi9999 merged commit 8fd0424 into jimp-dev:master Jul 23, 2018
@hipstersmoothie hipstersmoothie deleted the omggif branch July 23, 2018 06:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hipstersmoothie @edi9999