Remove rebase comments

2i2c-org · Mar 21, 2023 · f1744af · f1744af
1 parent 4f6324e
commit f1744af
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/config/clusters/cloudbank/avc.values.yaml b/config/clusters/cloudbank/avc.values.yaml
@@ -32,7 +32,6 @@ jupyterhub:
         scopes: [read:users!group=section1, servers!group=section2]
         users: [[email protected]]
     config:
-<<<<<<< HEAD
       loadGroups:
         section1:
           - [email protected]
@@ -42,7 +41,6 @@ jupyterhub:
           - [email protected]
           - [email protected]
           - [email protected]
-=======
       JupyterHub:
         authenticator_class: cilogon
       CILogonOAuthenticator:
@@ -51,7 +49,6 @@ jupyterhub:
         # Only show the option to login with Google
         shown_idps:
           - http://google.com/accounts/o8/id
->>>>>>> 1bf0e48c (Move cloudbank hubs from auth0 to cilogon)
       Authenticator:
         allowed_users: &avc_users
           - [email protected]