linux-next: bad merge in the jc_docs tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Jon,

I noticed that you left some conflict markers in
Documentation/admin-guide/index.rst in merge commit

  7a6992dc952e ("Merge branch 'doc-tweaks' into docs-next")

-- 
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html