fix conflicts

83303bc7 · LDOUBLEV · 3af943f3 · af0bac58 · 83303bc7 · 83303bc7
Commit 83303bc7 authored Oct 09, 2021 by LDOUBLEV
20 changed files
--- a/ppocr/utils/e2e_utils/pgnet_pp_utils.py
+++ b/ppocr/utils/e2e_utils/pgnet_pp_utils.py
--- a/ppocr/utils/gen_label.py
+++ b/ppocr/utils/gen_label.py
--- a/ppocr/utils/iou.py
+++ b/ppocr/utils/iou.py
--- a/ppocr/utils/logging.py
+++ b/ppocr/utils/logging.py
--- a/ppocr/utils/network.py
+++ b/ppocr/utils/network.py
--- a/ppocr/utils/profiler.py
+++ b/ppocr/utils/profiler.py
--- a/ppocr/utils/save_load.py
+++ b/ppocr/utils/save_load.py
--- a/ppstructure/README.md
+++ b/ppstructure/README.md
--- 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