resovle merge conflicts

31ca3b97 · Kaushik Shivakumar · 3e9d886d · 7fcd7cba · 31ca3b97 · 31ca3b97
Commit 31ca3b97 authored Jul 23, 2020 by Kaushik Shivakumar
20 changed files
--- a/orbit/README.md
+++ b/orbit/README.md
--- a/orbit/__init__.py
+++ b/orbit/__init__.py
--- a/official/staging/training/controller.py
+++ b/official/staging/training/controller.py
--- a/official/staging/training/controller_test.py
+++ b/official/staging/training/controller_test.py
--- a/official/staging/training/runnable.py
+++ b/official/staging/training/runnable.py
--- a/official/staging/training/standard_runnable.py
+++ b/official/staging/training/standard_runnable.py
--- a/orbit/standard_runner_test.py
+++ b/orbit/standard_runner_test.py
--- a/official/staging/training/utils.py
+++ b/official/staging/training/utils.py
--- a/research/attention_ocr/README.md
+++ b/research/attention_ocr/README.md
--- a/research/attention_ocr/python/common_flags.py
+++ b/research/attention_ocr/python/common_flags.py
--- a/research/attention_ocr/python/data_provider.py
+++ b/research/attention_ocr/python/data_provider.py
--- a/research/attention_ocr/python/datasets/fsns.py
+++ b/research/attention_ocr/python/datasets/fsns.py
--- a/research/attention_ocr/python/datasets/fsns_test.py
+++ b/research/attention_ocr/python/datasets/fsns_test.py
--- a/research/attention_ocr/python/datasets/testdata/fsns/download_data.py
+++ b/research/attention_ocr/python/datasets/testdata/fsns/download_data.py
--- a/research/attention_ocr/python/demo_inference.py
+++ b/research/attention_ocr/python/demo_inference.py
--- a/research/attention_ocr/python/demo_inference_test.py
+++ b/research/attention_ocr/python/demo_inference_test.py
--- a/research/attention_ocr/python/eval.py
+++ b/research/attention_ocr/python/eval.py
--- a/research/attention_ocr/python/inception_preprocessing.py
+++ b/research/attention_ocr/python/inception_preprocessing.py
--- a/research/attention_ocr/python/metrics.py
+++ b/research/attention_ocr/python/metrics.py
--- a/research/attention_ocr/python/metrics_test.py
+++ b/research/attention_ocr/python/metrics_test.py