whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1039 from foxish/patch-1

Browse Source 
Remove extraneous text left behind by improper merge.
This commit is contained in:
Phillip Wittrock
2016-08-15 16:04:28 -07:00
committed by GitHub
parent dd288afbf6 22ee5f3f09
commit b1d2346855
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/resourcequota/walkthrough.md
-1
View File
@@ -129,7 +129,6 @@ $ kubectl get pods --namespace=quota-example
``` ```
What happened? I have no pods! Let's describe the deployment to get a view of what is happening. What happened? I have no pods! Let's describe the deployment to get a view of what is happening.
<<<<<<< HEAD
```shell ```shell
$ kubectl describe deployment nginx --namespace=quota-example $ kubectl describe deployment nginx --namespace=quota-example