Skip to content

Commit

Permalink
Fix auto merge conflict 2750 [skip ci] (#2752)
Browse files Browse the repository at this point in the history
resolve conflict at #2750

this must be merged as `create a merge commit`
  • Loading branch information
pxLi authored Jan 10, 2025
2 parents 53ed880 + 346f192 commit 91620cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022-2024, NVIDIA CORPORATION.
Copyright (c) 2022-2025, NVIDIA CORPORATION.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# =============================================================================
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
# Copyright (c) 2022-2025, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
# in compliance with the License. You may obtain a copy of the License at
Expand Down

0 comments on commit 91620cb

Please sign in to comment.