diff options
| author | Thibault Serot <thibserot@gmail.com> | 2016-02-21 18:58:36 +0100 |
|---|---|---|
| committer | Thibault Serot <thibserot@gmail.com> | 2016-02-21 18:58:36 +0100 |
| commit | 0b50d4589f036abd1dbd67a864bc85acc768d715 (patch) | |
| tree | f9dbb4c5c559caa55af5ce104b164c272424d0a2 | |
| parent | 3a26a3eaffa596997f0f9742f6b1801936154f37 (diff) | |
| parent | 73c482e1c56f6986d6e466ae705adcff203e7f25 (diff) | |
Fixing conflct
| -rw-r--r-- | running-locally.md | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/running-locally.md b/running-locally.md index b30a7de6..a84bb08c 100644 --- a/running-locally.md +++ b/running-locally.md @@ -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 --> []() <!-- END MUNGE: GENERATED_ANALYTICS --> |