fix conflict

721c76b4 · LDOUBLEV · 98162be4 · b77f9ec0 · 721c76b4 · 721c76b4
Commit 721c76b4 authored Dec 16, 2021 by LDOUBLEV
9 changed files
--- a/tools/infer/predict_system.py
+++ b/tools/infer/predict_system.py
--- a/tools/infer/utility.py
+++ b/tools/infer/utility.py
--- a/tools/infer_cls.py
+++ b/tools/infer_cls.py
--- a/tools/infer_det.py
+++ b/tools/infer_det.py
--- a/tools/infer_e2e.py
+++ b/tools/infer_e2e.py
--- a/tools/infer_rec.py
+++ b/tools/infer_rec.py
--- a/tools/infer_table.py
+++ b/tools/infer_table.py
--- a/tools/program.py
+++ b/tools/program.py
--- a/tools/train.py
+++ b/tools/train.py