diff options
| author | Thibault Serot <thibserot@gmail.com> | 2016-01-30 19:46:56 +0100 |
|---|---|---|
| committer | Thibault Serot <thibserot@gmail.com> | 2016-01-30 19:46:56 +0100 |
| commit | 73c482e1c56f6986d6e466ae705adcff203e7f25 (patch) | |
| tree | 53bd38cb90d8fc34af396f71311108244e3dd73a | |
| parent | a4a50507a11f6f407c554bc8f4f19bc0a268a32a (diff) | |
Fixing conflict
| -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 dc9120fd..f5a5e85b 100644 --- a/running-locally.md +++ b/running-locally.md @@ -178,8 +178,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 --> |