From b992b00ddc963d6898877f47109abcfcf406ffdf Mon Sep 17 00:00:00 2001 From: tabedzki Date: Thu, 21 Jul 2022 23:30:03 -0400 Subject: [PATCH] Removed a HEAD INCOMING conflict --- CODE_OF_CONDUCT.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 947f117c7..8c56af363 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -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