Skip to content

K
k3s
Commit 85a9303b authored by Jay Lau's avatar Jay Lau
Browse files
Options

Removed code confilict symbols from mesos scheduler document.

parent abf9a900
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
contrib/mesos/docs/scheduler.md
View file @ 85a9303b
......@@ -136,7 +136,6 @@ offer-ttl = 5s
; duration an expired offer lingers in history
offer-linger-ttl = 2m
<<<<<<< HEAD
; duration between offer listener notifications
listener-delay = 1s
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment