more conflict issues

Project-AgML · Nov 28, 2024 · 37c3d94 · 37c3d94
1 parent 55ccf8f
commit 37c3d94
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/agml/data/tools.py b/agml/data/tools.py
@@ -31,9 +31,6 @@ def _resolve_coco_annotations(annotations):
             return annotations
         if len(annotations) == 1:
             return annotations
-<<<<<<< HEAD
-        annotation = {"bboxes": [], "labels": [], "area": [], "image_id": "", "iscrowd": [], "segmentation": []}
-=======
         annotation = {
             "bboxes": [],
             "labels": [],
@@ -42,7 +39,6 @@ def _resolve_coco_annotations(annotations):
             "iscrowd": [],
             "segmentation": [],
         }
->>>>>>> dev
         for a_set in annotations:
             annotation["bboxes"].append(a_set["bbox"])
             annotation["labels"].append(a_set["category_id"])