diff --git a/README.md b/README.md index 749b97a..38adfb2 100644 --- a/README.md +++ b/README.md @@ -334,8 +334,12 @@ make clean ## License & Authors If you would like to see the detailed LICENSE click [here](LICENSE). +<<<<<<< HEAD Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. +======= +Consult [contributors](https://github.com/oscal-compass/compliance-to-policy/graphs/contributors) for a list of authors and [maintainers](https://github.com/oscal-compass/community/blob/main/MAINTAINERS.md) for the core team. +>>>>>>> branch 'LF-website' of https://github.com/oscal-compass/compliance-to-policy.git ```text # Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved.