Removed code confilict symbols from mesos scheduler document.

This commit is contained in:
Jay Lau 2015-12-11 22:32:52 +08:00
parent abf9a90030
commit 85a9303bd6

View File

@ -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