lkml.org 
[lkml]   [2023]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] docs/zh_TW: rewrite index.rst
Date
Hu Haowen <src.res.211@gmail.com> writes:

> Update zh_TW's index.rst to the version of commit 0c7b4366f1ab ("docs:
> Rewrite the front page") with some reference from commit f4bf1cd4ac9c
> ("docs: move asm-annotations.rst into core-api") and commit eef24f7054a6
> ("docs/zh_CN: Rewrite the Chinese translation front page").
>
> Signed-off-by: Hu Haowen <src.res.211@gmail.com>
> ---
> Documentation/translations/zh_TW/index.rst | 156 ++++++++-------------
> 1 file changed, 56 insertions(+), 100 deletions(-)

So your two patches conflict with each other. I've sorted it out and
applied this, but it would be nicer if I didn't have to do that...

Thanks,

jon

\
 
 \ /
  Last update: 2023-07-16 20:51    [W:0.136 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site