mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Removed code confilict symbols from mesos scheduler document.
This commit is contained in:
parent
abf9a90030
commit
85a9303bd6
@ -136,7 +136,6 @@ offer-ttl = 5s
|
|||||||
; duration an expired offer lingers in history
|
; duration an expired offer lingers in history
|
||||||
offer-linger-ttl = 2m
|
offer-linger-ttl = 2m
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
; duration between offer listener notifications
|
; duration between offer listener notifications
|
||||||
listener-delay = 1s
|
listener-delay = 1s
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user