Merge pull request #18574 from jay-lau/master

Auto commit by PR queue bot

Merge pull request #18574 from jay-lau/master
a1f6cc3f · k8s-merge-robot · 09f9dc7d · 85a9303b · a1f6cc3f
Commit a1f6cc3f authored Dec 11, 2015 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

scheduler.md contrib/mesos/docs/scheduler.md +0 -1

No files found.
--- 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