Remove merge conflict leftover from k8s docs

b8b04a5e · Tobias Schmidt · 34bb811d · b8b04a5e
Commit b8b04a5e authored Jul 18, 2016 by Tobias Schmidt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

configuration.md content/docs/operating/configuration.md +0 -1

No files found.
--- a/content/docs/operating/configuration.md
+++ b/content/docs/operating/configuration.md
@@ -462,7 +462,6 @@ create multiple target groups:

 The following meta labels are available on targets during relabeling:

-<<<<<<< HEAD
 * All roles:
  * `__meta_kubernetes_role`: the role of the target: one of `endpoint`, `service`, `pod`, `container`, `node`, or `apiserver`
 * Nodes: