lkml.org 
[lkml]   [2016]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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

\
 
 \ /
  Last update: 2016-10-28 01:50    [W:0.041 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site