resolving conflicts

This commit is contained in:
Savitha Raghunathan
2020-07-08 16:01:48 -04:00
421 changed files with 10650 additions and 8434 deletions
@@ -1,12 +1,12 @@
---
title: kube-proxy
content_template: templates/tool-reference
content_type: tool-reference
weight: 30
---
<!--
---
title: kube-proxy
content_template: templates/tool-reference
content_type: tool-reference
weight: 28
---
-->
@@ -1,12 +1,12 @@
---
title: kube-scheduler
content_template: templates/tool-reference
content_type: tool-reference
weight: 28
---
<!--
---
title: kube-scheduler
content_template: templates/tool-reference
content_type: tool-reference
weight: 28
---
-->
@@ -1,6 +1,6 @@
---
title: kubelet
content_template: templates/tool-reference
content_type: tool-reference
weight: 28
---