resolve conflict with master

b0ccdb11 · Shixin Luo · e61588cd · 1611a8c5 · b0ccdb11 · b0ccdb11
Commit b0ccdb11 authored Sep 28, 2020 by Shixin Luo
10 changed files
--- a/research/object_detection/models/center_net_hourglass_feature_extractor_tf2_test.py
+++ b/research/object_detection/models/center_net_hourglass_feature_extractor_tf2_test.py
--- a/research/object_detection/models/center_net_mobilenet_v2_feature_extractor.py
+++ b/research/object_detection/models/center_net_mobilenet_v2_feature_extractor.py
--- a/research/object_detection/models/center_net_mobilenet_v2_fpn_feature_extractor.py
+++ b/research/object_detection/models/center_net_mobilenet_v2_fpn_feature_extractor.py
--- a/research/object_detection/models/center_net_mobilenet_v2_fpn_feature_extractor_tf2_test.py
+++ b/research/object_detection/models/center_net_mobilenet_v2_fpn_feature_extractor_tf2_test.py
--- a/research/object_detection/models/keras_models/hourglass_network.py
+++ b/research/object_detection/models/keras_models/hourglass_network.py
--- a/research/object_detection/models/keras_models/hourglass_network_tf2_test.py
+++ b/research/object_detection/models/keras_models/hourglass_network_tf2_test.py
--- a/research/object_detection/protos/center_net.proto
+++ b/research/object_detection/protos/center_net.proto
--- a/research/slim/datasets/imagenet.py
+++ b/research/slim/datasets/imagenet.py
--- a/research/slim/nets/mobilenet/mobilenet_example.ipynb
+++ b/research/slim/nets/mobilenet/mobilenet_example.ipynb
--- a/research/slim/nets/mobilenet_v1.py
+++ b/research/slim/nets/mobilenet_v1.py