resolve conflict

2020-06-15 02:59:15 +09:00
parent c9472ad4b6 ce768c84b7
commit 298382169c
2451 changed files with 127381 additions and 564546 deletions
@@ -1,16 +1,16 @@
 ---
 title: 複数のゾーンで動かす
 weight: 10
-content_template: templates/concept
+content_type: concept
 ---

-{{% capture overview %}}
+<!-- overview -->

 This page describes how to run a cluster in multiple zones.

-{{% /capture %}}

-{{% capture body %}}
+
+<!-- body -->

 ## 始めに

@@ -397,4 +397,4 @@ KUBERNETES_PROVIDER=aws KUBE_USE_EXISTING_MASTER=true KUBE_AWS_ZONE=us-west-2b k
 KUBERNETES_PROVIDER=aws KUBE_AWS_ZONE=us-west-2a kubernetes/cluster/kube-down.sh
 ```

-{{% /capture %}}
+