Skip to content
Snippets Groups Projects
Commit d26f0f3c authored by “Stavros-Anastasios's avatar “Stavros-Anastasios
Browse files

fix merge conflict

parent 0247cad7
No related branches found
No related tags found
2 merge requests!99Merge Latest changes from staging to main,!74fix vendor extensibility issues
Pipeline #10089 failed
Stage: staging_secrets_in_repo
Stage: staging_linting
Stage: staging_unit_tests
Stage: staging_security
Stage: staging_build_and_push
Stage: deploy_ocf_staging
Stage: delete_ocf_staging
Stage: dev_secrets_in_repo
Stage: dev_linting
Stage: dev_build_and_push
Stage: deploy_ocf_dev
Stage: delete_ocf_dev
Hide whitespace changes
Inline Side-by-side
services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py
+ 0
− 3
View file @ d26f0f3c
......@@ -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()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment