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 cpio #590

Merged
merged 6 commits into from
Apr 24, 2023
Merged

Add support for cpio #590

merged 6 commits into from
Apr 24, 2023

Conversation

dcfreire
Copy link
Contributor

@dcfreire dcfreire changed the title Added cpio support Added support for cpio Mar 31, 2023
@dcfreire dcfreire changed the title Added support for cpio Add support for cpio Mar 31, 2023
@sindresorhus
Copy link
Owner

Can you fix the merge conflict?

@dcfreire
Copy link
Contributor Author

Sure, on it.

core.d.ts Outdated
@@ -147,7 +147,8 @@ export type FileExtension =
| 'parquet'
| 'class'
| 'arj'
; // eslint-disable-line semi-style
| 'cpio'
; // eslint-disable-line semi-style
Copy link
Owner

Choose a reason for hiding this comment

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

Incorrect

package.json Outdated
@@ -199,7 +199,8 @@
"dwg",
"parquet",
"class",
"arj"
"arj",
"cpio"
Copy link
Owner

Choose a reason for hiding this comment

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

Incorrect indentation

@dcfreire
Copy link
Contributor Author

Sorry, I tried fixing the merge conflicts using the github editor and it messed up the formatting, fixing now.

@sindresorhus
Copy link
Owner

Always look over your own diff after changes ;)

@sindresorhus sindresorhus merged commit f84e96c into sindresorhus:main Apr 24, 2023
3 checks passed
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.

None yet

2 participants