From 85a9303bd6feb8f3f7de52d784800a87154daced Mon Sep 17 00:00:00 2001 From: Jay Lau Date: Fri, 11 Dec 2015 22:32:52 +0800 Subject: [PATCH] Removed code confilict symbols from mesos scheduler document. --- contrib/mesos/docs/scheduler.md | 1 - 1 file changed, 1 deletion(-) 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