From 37c3d94b277f064208eea8becb07506bbf72cb26 Mon Sep 17 00:00:00 2001
From: "Leandro G. Almeida" <leandro.g.almeida@gmail.com>
Date: Thu, 28 Nov 2024 10:33:00 -0800
Subject: [PATCH] more conflict issues

---
 agml/data/tools.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/agml/data/tools.py b/agml/data/tools.py
index 074027d8..1d5beaab 100644
--- 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"])