Messages in this thread | | | Date | Thu, 27 Oct 2016 17:50:13 -0600 | From | Jonathan Corbet <> | Subject | Re: linux-next: bad merge in the jc_docs tree |
| |
On Fri, 28 Oct 2016 10:30:29 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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")
Argh. I noticed that too, but failed to amend the merge before pushing. Thanks for the heads-up.
jon
| |