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

Fix conflicts in Unix library stubs #2814

Merged
merged 3 commits into from
Aug 12, 2024
Merged

Fix conflicts in Unix library stubs #2814

merged 3 commits into from
Aug 12, 2024

Conversation

mshinwell
Copy link
Collaborator

As subject

@mshinwell mshinwell merged commit 20cbbc5 into ocaml-flambda:merge-5.2 Aug 12, 2024
1 of 18 checks passed
lukemaurer pushed a commit to lukemaurer/flambda-backend that referenced this pull request Oct 23, 2024
@mshinwell
flambda-backend: Fix conflicts in Unix library stubs (ocaml-flambda#2814
03d721b 
)

* Resolve conflict in unixsupport_unix.c

* Resolve conflict in fork.c and signals.c

* Remove redundant comment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stedolan stedolan stedolan approved these changes

Assignees
No one assigned
Labels
OCaml 5.2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mshinwell @stedolan