fix more merge conflicts

kubernetes · Mar 8, 2018 · 4fe8acf · 4fe8acf
2 parents 7525660 + bb8c59a
commit 4fe8acf
Show file tree

Hide file tree

Showing 3 changed files with 240 additions and 137 deletions.
diff --git a/docs/getting-started-guides/ubuntu/installation.md b/docs/getting-started-guides/ubuntu/installation.md
@@ -175,7 +175,7 @@ mkdir -p ~/.kube
 Copy the kubeconfig file to the default location.
 
 ```
-juju scp kubernetes-master/0:/home/ubuntu/config ~/.kube/config
+sudo juju scp kubernetes-master/0:/home/ubuntu/config ~/.kube/config
 ```
 
 The next step is to install the kubectl client on your local machine. The recommended way to do this on Ubuntu is using the kubectl snap ([https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-snap-on-ubuntu](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-with-snap-on-ubuntu)).