[latex3-commits] [git/LaTeX3-latex3-latex2e] copyedits-chris: Merge branch 'copyedits-chris' of git at github.com:latex3/latex2e.git (6f163c43)

[Chris Rowley]

> On 7 Sep 2021, at 21:45, Frank Mittelbach <frank.mittelbach at latex-project.org> wrote:
> it looks like it,

Good.

> though I'm a bit worried about the line
> 
>  Conflicts:
>  base/lthooks.dtx
> 
> in your commit message

That is not my message.

> --- there doesnt seem to be a conflict at origin

What is a ‘conflict at origin’? 

> but perhaps your local copy has a conflict (ie some <<<<<<<<<< lines in it)
Where would that be in ‘my local copy’?  copy of what?

Maybe I should start again locally? 

WorkingCopy is ipad, yes.

Chris