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 auto merge conflict 10425 [skip ci] #10426

Merged
merged 3 commits into from
Feb 15, 2024

Conversation

NvTimLiu
Copy link
Collaborator

@NvTimLiu NvTimLiu commented Feb 15, 2024

Resolve auto-merge conflict at #10425.

Keep version 24.04.0-SNAPSHOT in pom.xml but update copyright to 2024

NOTE: this must be merged as create a merge commit

* Init changelog 24.02

Init changelog with

    GITHUB_TOKEN=<> scripts/generate-changelog --releases=23.12,24.02

    move 23.10 content to archives folder

Signed-off-by: Tim Liu <timl@nvidia.com>

* Update Change log

Signed-off-by: Tim Liu <timl@nvidia.com>

* Update Change log

Signed-off-by: Tim Liu <timl@nvidia.com>

---------

Signed-off-by: Tim Liu <timl@nvidia.com>
@NvTimLiu NvTimLiu self-assigned this Feb 15, 2024
@NvTimLiu NvTimLiu added the documentation Improvements or additions to documentation label Feb 15, 2024
@NvTimLiu NvTimLiu changed the title Fix auto merge conflict 10425 Fix auto merge conflict 10425 [skip ci] Feb 15, 2024
@NvTimLiu
Copy link
Collaborator Author

build

@jlowe jlowe merged commit 68a1a03 into NVIDIA:branch-24.04 Feb 15, 2024
40 of 41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants