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/out20.jpg
+++ b/research/object_detection/test_images/ducky/test/out20.jpg
--- a/research/object_detection/test_images/ducky/test/out21.jpg
+++ b/research/object_detection/test_images/ducky/test/out21.jpg
--- a/research/object_detection/test_images/ducky/test/out22.jpg
+++ b/research/object_detection/test_images/ducky/test/out22.jpg
--- a/research/object_detection/test_images/ducky/test/out23.jpg
+++ b/research/object_detection/test_images/ducky/test/out23.jpg
--- a/research/object_detection/test_images/ducky/test/out24.jpg
+++ b/research/object_detection/test_images/ducky/test/out24.jpg
--- a/research/object_detection/test_images/ducky/test/out25.jpg
+++ b/research/object_detection/test_images/ducky/test/out25.jpg
--- a/research/object_detection/test_images/ducky/test/out26.jpg
+++ b/research/object_detection/test_images/ducky/test/out26.jpg
--- a/research/object_detection/test_images/ducky/test/out27.jpg
+++ b/research/object_detection/test_images/ducky/test/out27.jpg
--- a/research/object_detection/test_images/ducky/test/out28.jpg
+++ b/research/object_detection/test_images/ducky/test/out28.jpg
--- a/research/object_detection/test_images/ducky/test/out29.jpg
+++ b/research/object_detection/test_images/ducky/test/out29.jpg
--- a/research/object_detection/test_images/ducky/test/out3.jpg
+++ b/research/object_detection/test_images/ducky/test/out3.jpg
--- a/research/object_detection/test_images/ducky/test/out30.jpg
+++ b/research/object_detection/test_images/ducky/test/out30.jpg
--- a/research/object_detection/test_images/ducky/test/out31.jpg
+++ b/research/object_detection/test_images/ducky/test/out31.jpg
--- a/research/object_detection/test_images/ducky/test/out32.jpg
+++ b/research/object_detection/test_images/ducky/test/out32.jpg
--- a/research/object_detection/test_images/ducky/test/out33.jpg
+++ b/research/object_detection/test_images/ducky/test/out33.jpg
--- a/research/object_detection/test_images/ducky/test/out34.jpg
+++ b/research/object_detection/test_images/ducky/test/out34.jpg
--- a/research/object_detection/test_images/ducky/test/out35.jpg
+++ b/research/object_detection/test_images/ducky/test/out35.jpg
--- a/research/object_detection/test_images/ducky/test/out36.jpg
+++ b/research/object_detection/test_images/ducky/test/out36.jpg
--- a/research/object_detection/test_images/ducky/test/out37.jpg
+++ b/research/object_detection/test_images/ducky/test/out37.jpg
--- a/research/object_detection/test_images/ducky/test/out38.jpg
+++ b/research/object_detection/test_images/ducky/test/out38.jpg