fix conflicts

83303bc7 · LDOUBLEV · 3af943f3 · af0bac58 · 83303bc7 · 83303bc7
Commit 83303bc7 authored Oct 09, 2021 by LDOUBLEV
20 changed files
--- a/doc/doc_en/algorithm_overview_en.md
+++ b/doc/doc_en/algorithm_overview_en.md
--- a/doc/doc_en/angle_class_en.md
+++ b/doc/doc_en/angle_class_en.md
--- a/doc/doc_en/benchmark_en.md
+++ b/doc/doc_en/benchmark_en.md
--- a/doc/doc_en/config_en.md
+++ b/doc/doc_en/config_en.md
--- a/doc/doc_en/detection_en.md
+++ b/doc/doc_en/detection_en.md
--- a/doc/doc_en/distributed_training.md
+++ b/doc/doc_en/distributed_training.md
--- a/doc/doc_en/environment_en.md
+++ b/doc/doc_en/environment_en.md
--- a/doc/doc_en/inference_en.md
+++ b/doc/doc_en/inference_en.md
--- a/doc/doc_en/inference_ppocr_en.md
+++ b/doc/doc_en/inference_ppocr_en.md
--- a/doc/doc_en/models_and_config_en.md
+++ b/doc/doc_en/models_and_config_en.md
--- a/doc/doc_en/models_en.md
+++ b/doc/doc_en/models_en.md
--- a/doc/doc_en/models_list_en.md
+++ b/doc/doc_en/models_list_en.md
--- a/doc/doc_en/multi_languages_en.md
+++ b/doc/doc_en/multi_languages_en.md
--- a/doc/doc_en/paddleOCR_overview_en.md
+++ b/doc/doc_en/paddleOCR_overview_en.md
--- a/doc/doc_en/pgnet_en.md
+++ b/doc/doc_en/pgnet_en.md
--- a/doc/doc_en/quickstart_en.md
+++ b/doc/doc_en/quickstart_en.md
--- a/doc/doc_en/recognition_en.md
+++ b/doc/doc_en/recognition_en.md
--- a/doc/doc_en/training_en.md
+++ b/doc/doc_en/training_en.md
--- a/doc/doc_en/update_en.md
+++ b/doc/doc_en/update_en.md
--- a/doc/doc_en/visualization_en.md
+++ b/doc/doc_en/visualization_en.md