Skip to content

Release 1.5.0: Remove merge artifacts in develop-2.0.0 - #206

Merged
eoghanscasey merged 1 commit into
develop-2.0.0from
release-1.5.0-into-develop-2.0.0
Jul 31, 2026
Merged

Release 1.5.0: Remove merge artifacts in develop-2.0.0#206
eoghanscasey merged 1 commit into
develop-2.0.0from
release-1.5.0-into-develop-2.0.0

Conversation

@ajnelson-nist

Copy link
Copy Markdown
Member

This is a maintenance, catch-up Pull Request, incorporating no new features. Once CI passes, it can be merged.

With apologies, this is posted because #205 included some merge artifacts due to files not rebuilding. Another PR will need to fix some Make scripting.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@ajnelson-nist ajnelson-nist added the Project-Bug Something isn't working. label Jul 28, 2026
@ajnelson-nist

Copy link
Copy Markdown
Member Author

This PR is ready for review and merge.

@ajnelson-nist
ajnelson-nist marked this pull request as ready for review July 28, 2026 15:32
@ajnelson-nist
ajnelson-nist requested a review from a team July 28, 2026 15:32

@eoghanscasey eoghanscasey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

PR Approved

@eoghanscasey
eoghanscasey merged commit 4fdafcf into develop-2.0.0 Jul 31, 2026
1 check passed
@ajnelson-nist ajnelson-nist added this to the CASE 1.5.0 milestone Jul 31, 2026
@ajnelson-nist
ajnelson-nist deleted the release-1.5.0-into-develop-2.0.0 branch August 4, 2026 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Project-Bug Something isn't working.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants