From a4927d2d2417285edb83d4f80812c2489341bdec Mon Sep 17 00:00:00 2001 From: Sophie <29382425+sophietheking@users.noreply.github.com> Date: Thu, 7 Apr 2022 17:42:40 +0200 Subject: [PATCH] small fix --- contributing/content-style-guide.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/contributing/content-style-guide.md b/contributing/content-style-guide.md index 3e306aee03..eb922606d1 100644 --- a/contributing/content-style-guide.md +++ b/contributing/content-style-guide.md @@ -550,8 +550,6 @@ When referring to a user account that a person creates and manages on GitHub.com In administrative content for GitHub Enterprise Cloud with Enterprise Managed Users, GitHub Enterprise Server, or GitHub AE, use "user account." For GitHub Enterprise Cloud and GitHub AE, you can also use "enterprise member" when describing an individual user account that is an enterprise administrator or that contributes to an organization owned by an enterprise. -<<<<<<< HEAD -======= Most administrative content is in the following locations. This list is not exhaustive. - The "[Enterprise administrators](https://docs.github.com/en/enterprise-cloud@latest/admin)" product @@ -560,7 +558,6 @@ Most administrative content is in the following locations. This list is not exha - Organization-level GitHub Enterprise Cloud features, like the "[Managing SAML single sign-on for your organization](https://docs.github.com/en/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization)" and "[Granting access to your organization with SAML single sign-on](https://docs.github.com/en/enterprise-cloud@latest/organizations/granting-access-to-your-organization-with-saml-single-sign-on)" categories - Enterprise-specific API content, like the "[GitHub Enterprise administration](https://docs.github.com/en/enterprise-cloud@latest/rest/reference/enterprise-admin)" REST API reference documentation ->>>>>>> 13b78f6a0b15149e289096422717ad251e3eb219 Examples for each product: - GitHub.com (Free or Pro plans)