resolving conflicts

2020-06-16 17:08:15 -04:00
parent 3ad8c45b0b 13ca92d745
commit 7ddedb00a0
1497 changed files with 24525 additions and 14364 deletions
@@ -6,15 +6,15 @@ reviewers:
 - deads2k
 - liggitt
 title: Authenticating
-content_template: templates/concept
+content_type: concept
 weight: 10
 ---

-{{% capture overview %}}
+<!-- overview -->
 This page provides an overview of authenticating.
-{{% /capture %}}

-{{% capture body %}}
+
+<!-- body -->
 ## Users in Kubernetes

 All Kubernetes clusters have two categories of users: service accounts managed
@@ -840,4 +840,4 @@ RFC3339 timestamp. Presence or absence of an expiry has the following impact:
  }
 }
 ```
-{{% /capture %}}
+