Merge pull request #1039 from foxish/patch-1

Remove extraneous text left behind by improper merge.
2016-08-15 16:04:28 -07:00
parent dd288afbf6 22ee5f3f09
commit b1d2346855
1 changed files with 1 additions and 2 deletions
@@ -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.
-<<<<<<< HEAD

 ```shell
 $ kubectl describe deployment nginx --namespace=quota-example