Hu Haowen <src.res.211@xxxxxxxxx> 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@xxxxxxxxx>
> ---
> 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
