From d26f0f3c700d919865684bb9899b6f5871c53cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CStavros-Anastasios?= <“charismiadis@fogus.gr”>
Date: Wed, 20 Nov 2024 14:25:48 +0200
Subject: [PATCH] fix merge conflict

---
 .../published_apis/core/serviceapidescriptions.py              | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
index 40f8219b..80ba9e13 100644
--- a/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
+++ b/services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
@@ -9,14 +9,11 @@ from .responses import internal_server_error, forbidden_error, not_found_error,
 from .auth_manager import AuthManager
 from .redis_event import RedisEvent
 from .publisher import Publisher
-<<<<<<< Updated upstream
 from ..models.service_api_description import ServiceAPIDescription
 import json
 from ..encoder import CustomJSONEncoder
-=======
 from ..vendor_specific import add_vend_spec_fields
 
->>>>>>> Stashed changes
 publisher_ops = Publisher()
 
 
-- 
GitLab