Fixing conflct

This commit is contained in:
Thibault Serot 2016-02-21 18:58:36 +01:00
commit b6ce3f3411

View File

@ -187,8 +187,6 @@ KUBE_DNS_REPLICAS=1
To know more on DNS service you can look [here](http://issue.k8s.io/6667). Related documents can be found [here](../../cluster/addons/dns/#how-do-i-configure-it)
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/docs/devel/running-locally.md?pixel)]()
<!-- END MUNGE: GENERATED_ANALYTICS -->