fix conflicts

This commit is contained in:
Rourke750
2020-01-02 12:01:31 -05:00
-1
View File
@@ -22,7 +22,6 @@ class MqttObjectPublisher(threading.Thread):
# make a copy of detected objects
detected_objects = self._detected_objects.copy()
# total up all scores by object type
obj_counter = Counter()
for obj in detected_objects: