Skip to content

Fix compilation error after merge#587

Merged
lthls merged 1 commit intomainfrom
arm64-arch-fix
Mar 22, 2022
Merged

Fix compilation error after merge#587
lthls merged 1 commit intomainfrom
arm64-arch-fix

Conversation

@lthls
Copy link
Copy Markdown
Contributor

@lthls lthls commented Mar 21, 2022

Caused by an undetected conflict between #556 and #547.

This makes the CI fail and prevents us from merging other PRs.

Caused by an undetected conflict between #556 and #547
@lthls lthls requested review from gretay-js and xclerc as code owners March 21, 2022 16:44
@lthls lthls merged commit 0edeea7 into main Mar 22, 2022
mshinwell pushed a commit that referenced this pull request May 20, 2022
Caused by an undetected conflict between #556 and #547
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.

2 participants