coreos/fleet — pull request #313 by bcwaldon (2014-04-09 19:20:57+00:00)
Title: fix(payload): Use FleetXConflicts constant

The "Conflicts" string was still being used directly in job/payload.go. It should be using the constant FleetXConflicts.