fix the rest files

openvinotoolkit · Dec 18, 2024 · dd56135 · dd56135
1 parent 2c733c0
commit dd56135
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/src/otx/core/exporter/exportable_code/demo/requirements.txt b/src/otx/core/exporter/exportable_code/demo/requirements.txt
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 openvino==2024.5.0
-=======
-openvino==2024.3.0
->>>>>>> releases/2.2.0
 openvino-model-api==0.2.5
 numpy==1.26.4
diff --git a/tox.ini b/tox.ini
@@ -56,11 +56,7 @@ commands =
         {posargs}
 
 
-<<<<<<< HEAD
 [testenv:integration-test-{all, action, classification, multi_cls_classification, multi_label_classification, hlabel_classification, detection, rotated_detection, keypoint_detection, instance_segmentation, semantic_segmentation, visual_prompting_all, visual_prompting, zero_shot_visual_prompting, anomaly, anomaly_classification, anomaly_detection, anomaly_segmentation, object_detection_3d}]
-=======
-[testenv:integration-test-{all, action, classification, multi_cls_classification, multi_label_classification, hlabel_classification, detection, rotated_detection, keypoint_detection, instance_segmentation, semantic_segmentation, visual_prompting_all, visual_prompting, zero_shot_visual_prompting, anomaly, anomaly_classification, anomaly_detection, anomaly_segmentation}]
->>>>>>> releases/2.2.0
 setenv =
     CUBLAS_WORKSPACE_CONFIG=:4096:8
 deps =