From 5dcbc13e8691362bfa19575b5f5f62be882f2967 Mon Sep 17 00:00:00 2001 From: Grace Park Date: Tue, 27 Jun 2023 11:56:15 -0700 Subject: [PATCH] 2 more fixes for site-policy (#38637) --- .../github-terms/github-corporate-terms-of-service.md | 4 ---- .../privacy-policies/github-octernships-terms-of-service.md | 4 ---- 2 files changed, 8 deletions(-) diff --git a/content/site-policy/github-terms/github-corporate-terms-of-service.md b/content/site-policy/github-terms/github-corporate-terms-of-service.md index 9f38648c09..7d5a947af9 100644 --- a/content/site-policy/github-terms/github-corporate-terms-of-service.md +++ b/content/site-policy/github-terms/github-corporate-terms-of-service.md @@ -177,12 +177,8 @@ Customer is responsible for managing access to its Private Repositories, includi GitHub considers Customer Content in Customer’s Private Repositories to be Customer’s Confidential Information. GitHub will protect and keep strictly confidential the Customer Content of Private Repositories in accordance with Section P. ### 3. Access -<<<<<<< HEAD GitHub personnel may only access Customer's Private Repositories in the situations described in our [Privacy Statement](/site-policy/privacy-policies/github-privacy-statement#repository-contents). -======= -GitHub personnel may only access Customer's Private Repositories in the situations described in our [Privacy Statement](/site-policy/privacy-policies/github-privacy-statement#repository-contents). ->>>>>>> main Customer may choose to enable additional access to its Private Repositories. For example, Customer may enable various GitHub services or features that require additional rights to Customer Content in Private Repositories. These rights may vary depending on the service or feature, but GitHub will continue to treat Customer Content in Customer’s Private Repositories as Customer’s Confidential Information. If those services or features require rights in addition to those it needs to provide the Service, GitHub will provide an explanation of those rights. diff --git a/content/site-policy/privacy-policies/github-octernships-terms-of-service.md b/content/site-policy/privacy-policies/github-octernships-terms-of-service.md index 898c9d2809..8c9728b986 100644 --- a/content/site-policy/privacy-policies/github-octernships-terms-of-service.md +++ b/content/site-policy/privacy-policies/github-octernships-terms-of-service.md @@ -25,12 +25,8 @@ The Program is offered to verified students on GitHub Global Campus in countries You hereby grant the Octernships Partners a non-exclusive, irrevocable, perpetual, royalty-free, worldwide license to make, have made, use, offer to sell, sell, import, copy, modify, create derivative works based upon, distribute, sublicense, display, perform and transmit any work product you create in connection with the Program or during your internship, including, without limitation, concepts, works, inventions, information, drawings, designs, programs, or software. ### 2.2 Likeness -<<<<<<< HEAD GitHub and Octernships Partners reserve all rights, including the right to edit, publish, use, adapt, modify or dispose of any work product/description, likenesses, and photographs for advertising and promotional purposes in all media (including, but not limited to, the internet) without additional compensation, except where prohibited by law. -======= -GitHub and Octernships Partners reserve all rights, including the right to edit, publish, use, adapt, modify or dispose of any work product/description, likenesses, and photographs for advertising and promotional purposes in all media (including, but not limited to, the internet) without additional compensation, except where prohibited by law. ->>>>>>> main ## 3. Confidentiality and non-disclosure