| Message ID | 20211221080044.41746-1-heinrich.schuchardt@canonical.com |
|---|---|
| State | Accepted |
| Commit | b4a0b76585cdba396c6d7fd2e3858821a3355f34 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] doc: remove duplicate page inclusion | expand |
On Tue, Dec 21, 2021 at 09:00:44AM +0100, Heinrich Schuchardt wrote: > doc/usage/index.rst in branch origin/next includes usage/environment twice. > Remove the duplicate entry. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > --- > Hello Tom, > > this seems to be merge error. We need this patch to build 'make htmldocs'. > Please, apply to origin/next without further pull request. I'm applying this note. Just for the record, CI is passing: https://source.denx.de/u-boot/u-boot/-/jobs/367582 and also passed before I pushed to next itself: https://source.denx.de/u-boot/u-boot/-/jobs/367539
On Tue, Dec 21, 2021 at 09:00:44AM +0100, Heinrich Schuchardt wrote: > doc/usage/index.rst in branch origin/next includes usage/environment twice. > Remove the duplicate entry. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Applied to u-boot/next, thanks!
diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 3905540735..33761af96a 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -11,7 +11,6 @@ Use U-Boot netconsole partitions cmdline - environment Shell commands --------------
doc/usage/index.rst in branch origin/next includes usage/environment twice. Remove the duplicate entry. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- Hello Tom, this seems to be merge error. We need this patch to build 'make htmldocs'. Please, apply to origin/next without further pull request. Best regards Heinrich --- doc/usage/index.rst | 1 - 1 file changed, 1 deletion(-)