Skip to content

Commit

Permalink
fix merge conflict in readme
Browse files Browse the repository at this point in the history
Signed-off-by: David Cui <[email protected]>
  • Loading branch information
davidcui1225 committed May 27, 2021
2 parents c325710 + 4ba7ff4 commit 8c3b56f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ We welcome you to get involved in development, documentation, testing the OpenSe

## Code of Conduct

This project has adopted an [Open Source Code of Conduct](https://github.com/opensearch-project/project-website/blob/main/CONTRIBUTING.md#code-of-conduct).
This project has adopted an [Open Source Code of Conduct](https://opensearch.org/codeofconduct.html).

## Security issue notifications

Expand Down
2 changes: 1 addition & 1 deletion dashboards-reports/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ We welcome you to get involved in development, documentation, testing the OpenSe

## Code of Conduct

This project has adopted an [Open Source Code of Conduct](https://github.com/opensearch-project/project-website/blob/main/CONTRIBUTING.md#code-of-conduct).
This project has adopted an [Open Source Code of Conduct](https://opensearch.org/codeofconduct.html).

## Security issue notifications

Expand Down

0 comments on commit 8c3b56f

Please sign in to comment.