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

Remove extraneous text left behind by improper merge.

Browse Source
This commit is contained in:
Anirudh Ramanathan
2016-08-15 12:56:36 -07:00
committed by GitHub
parent ff136a08ff
commit 22ee5f3f09
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