diff --git a/contrib/mesos/docs/scheduler.md b/contrib/mesos/docs/scheduler.md index 1c4a537d089..bf5f6f778db 100644 --- a/contrib/mesos/docs/scheduler.md +++ b/contrib/mesos/docs/scheduler.md @@ -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