[Buildbot-commits] [buildbot/buildbot] b8477e: fix merge resolution mistake

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: b8477e9ce78495c9217a3288b753865977fd0d9e
      https://github.com/buildbot/buildbot/commit/b8477e9ce78495c9217a3288b753865977fd0d9e
  Author: Pierre Tardy <pierre.tardy at intel.com>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

  Changed paths:
    M master/docs/manual/cfg-statustargets.rst

  Log Message:
  -----------
  fix merge resolution mistake

Signed-off-by: Pierre Tardy <pierre.tardy at intel.com>