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

Fix oclif pack macos #866

Merged
merged 1 commit into from Apr 18, 2022
Merged

Fix oclif pack macos #866

merged 1 commit into from Apr 18, 2022

Conversation

RodEsp
Copy link
Contributor

@RodEsp RodEsp commented Apr 18, 2022

This removes outdated code that was accidentally re-introduced by bad conflict resolution on a merge.

The code was re-added to main when this commit, e5b68af, to revert some changes was added. This caused merge conflicts with the PR that added the M1 functionality, #849, and those were incorrectly resolved when it was merged.

Fixes #865

@RodEsp RodEsp self-assigned this Apr 18, 2022
@RodEsp RodEsp merged commit e3f60a3 into main Apr 18, 2022
@RodEsp RodEsp deleted the re/fix-bad-merge-resolution branch April 18, 2022 18:21
gaelmotte pushed a commit to gaelmotte/oclif that referenced this pull request Oct 24, 2022
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.

macOS Build process fails
2 participants