resovle merge conflicts

31ca3b97 · Kaushik Shivakumar · 3e9d886d · 7fcd7cba · 31ca3b97 · 31ca3b97
Commit 31ca3b97 authored Jul 23, 2020 by Kaushik Shivakumar
20 changed files
--- a/research/object_detection/test_images/ducky/test/out39.jpg
+++ b/research/object_detection/test_images/ducky/test/out39.jpg
--- a/research/object_detection/test_images/ducky/test/out4.jpg
+++ b/research/object_detection/test_images/ducky/test/out4.jpg
--- a/research/object_detection/test_images/ducky/test/out40.jpg
+++ b/research/object_detection/test_images/ducky/test/out40.jpg
--- a/research/object_detection/test_images/ducky/test/out41.jpg
+++ b/research/object_detection/test_images/ducky/test/out41.jpg
--- a/research/object_detection/test_images/ducky/test/out42.jpg
+++ b/research/object_detection/test_images/ducky/test/out42.jpg
--- a/research/object_detection/test_images/ducky/test/out43.jpg
+++ b/research/object_detection/test_images/ducky/test/out43.jpg
--- a/research/object_detection/test_images/ducky/test/out44.jpg
+++ b/research/object_detection/test_images/ducky/test/out44.jpg
--- a/research/object_detection/test_images/ducky/test/out45.jpg
+++ b/research/object_detection/test_images/ducky/test/out45.jpg
--- a/research/object_detection/test_images/ducky/test/out46.jpg
+++ b/research/object_detection/test_images/ducky/test/out46.jpg
--- a/research/object_detection/test_images/ducky/test/out47.jpg
+++ b/research/object_detection/test_images/ducky/test/out47.jpg
--- a/research/object_detection/test_images/ducky/test/out48.jpg
+++ b/research/object_detection/test_images/ducky/test/out48.jpg
--- a/research/object_detection/test_images/ducky/test/out49.jpg
+++ b/research/object_detection/test_images/ducky/test/out49.jpg
--- a/research/object_detection/test_images/ducky/test/out5.jpg
+++ b/research/object_detection/test_images/ducky/test/out5.jpg
--- a/research/object_detection/test_images/ducky/test/out6.jpg
+++ b/research/object_detection/test_images/ducky/test/out6.jpg
--- a/research/object_detection/test_images/ducky/test/out7.jpg
+++ b/research/object_detection/test_images/ducky/test/out7.jpg
--- a/research/object_detection/test_images/ducky/test/out8.jpg
+++ b/research/object_detection/test_images/ducky/test/out8.jpg
--- a/research/object_detection/test_images/ducky/test/out9.jpg
+++ b/research/object_detection/test_images/ducky/test/out9.jpg
--- a/research/object_detection/test_images/ducky/train/robertducky1.jpg
+++ b/research/object_detection/test_images/ducky/train/robertducky1.jpg
--- a/research/object_detection/test_images/ducky/train/robertducky2.jpg
+++ b/research/object_detection/test_images/ducky/train/robertducky2.jpg
--- a/research/object_detection/test_images/ducky/train/robertducky3.jpg
+++ b/research/object_detection/test_images/ducky/train/robertducky3.jpg