fix conflict

6c7ff9c7 · LDOUBLEV · ac91a9e1 · 9b8f587e · 6c7ff9c7 · 6c7ff9c7
Commit 6c7ff9c7 authored Aug 05, 2021 by LDOUBLEV
20 changed files
--- a/ppstructure/README_ch.md
+++ b/ppstructure/README_ch.md
--- a/ppstructure/__init__.py
+++ b/ppstructure/__init__.py
--- a/ppstructure/layout/README.md
+++ b/ppstructure/layout/README.md
--- a/ppstructure/layout/README_ch.md
+++ b/ppstructure/layout/README_ch.md
--- a/ppstructure/layout/train_layoutparser_model.md
+++ b/ppstructure/layout/train_layoutparser_model.md
--- a/ppstructure/layout/train_layoutparser_model_ch.md
+++ b/ppstructure/layout/train_layoutparser_model_ch.md
--- a/ppstructure/predict_system.py
+++ b/ppstructure/predict_system.py
--- a/ppstructure/table/README.md
+++ b/ppstructure/table/README.md
--- a/ppstructure/table/README_ch.md
+++ b/ppstructure/table/README_ch.md
--- a/ppstructure/table/__init__.py
+++ b/ppstructure/table/__init__.py
--- a/ppstructure/table/eval_table.py
+++ b/ppstructure/table/eval_table.py
--- a/ppstructure/table/matcher.py
+++ b/ppstructure/table/matcher.py
--- a/ppstructure/table/predict_structure.py
+++ b/ppstructure/table/predict_structure.py
--- a/ppstructure/table/predict_table.py
+++ b/ppstructure/table/predict_table.py
--- a/ppstructure/table/table_metric/__init__.py
+++ b/ppstructure/table/table_metric/__init__.py
--- a/ppstructure/table/table_metric/parallel.py
+++ b/ppstructure/table/table_metric/parallel.py
--- a/ppstructure/table/table_metric/table_metric.py
+++ b/ppstructure/table/table_metric/table_metric.py
--- a/ppstructure/table/tablepyxl/__init__.py
+++ b/ppstructure/table/tablepyxl/__init__.py
--- a/ppstructure/table/tablepyxl/style.py
+++ b/ppstructure/table/tablepyxl/style.py
--- a/ppstructure/table/tablepyxl/tablepyxl.py
+++ b/ppstructure/table/tablepyxl/tablepyxl.py