Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Removed a HEAD INCOMING git conflict #1752

Merged
merged 1 commit into from
Jul 22, 2022
Merged

Removed a HEAD INCOMING git conflict #1752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions CODE_OF_CONDUCT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,7 @@ Representation of a project may be further defined and clarified by project
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
<<<<<<< HEAD
reported by contacting [cpp-conduct@nvidia.com](mailto:cpp-conduct@nvidia.com).
=======
reported by contacting [cpp-conduct@nvidia.com].
>>>>>>> 33767b46... Docs: Move `README.md`, `CHANGELOG.md`, and `CODE_OF_CONDUCT.md` back to their
All complaints will be reviewed and investigated and will result in a response
that is deemed necessary and appropriate to the circumstances.
The project team is obligated to maintain confidentiality with regard to the
Expand Down