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.

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

Add support for ac3 and voc formats #201

Merged
merged 2 commits into from Apr 20, 2019

Conversation

stroncium
Copy link
Contributor

@stroncium stroncium commented Apr 12, 2019

Copy link
Collaborator

@Borewit Borewit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check the AC3 MIME-type.
Everything else looks good to me.

readme.md Show resolved Hide resolved
index.js Show resolved Hide resolved
@sindresorhus
Copy link
Owner

@stroncium Can you fix the merge conflict?

@sindresorhus sindresorhus changed the title Add support for ac3 and voc Add support for ac3 and voc formats Apr 19, 2019
@stroncium
Copy link
Contributor Author

@sindresorhus done

@sindresorhus
Copy link
Owner

There are still conflicts.

@stroncium
Copy link
Contributor Author

@sindresorhus because you just merged another pull? --_--

@sindresorhus
Copy link
Owner

Yeah, might be because of that. I could have sworn there were more conflicts than what was touched in the last PR though.

@sindresorhus sindresorhus merged commit 7038abc into sindresorhus:master Apr 20, 2019
@stroncium
Copy link
Contributor Author

@sindresorhus Same issue as the one we fixed with alphabetical sort in unicorn rules. Annoying as hell. =/

@sindresorhus
Copy link
Owner

Yeah. I feel Git and GitHub could have smarter automatic conflict resolution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for AC3 and VOC
3 participants