Rebase pain.

airbytehq · Nov 21, 2024 · bf377a6 · bf377a6
1 parent fa80074
commit bf377a6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/...te-ci/connectors/metadata_service/orchestrator/orchestrator/assets/registry_entry.py.orig b/...te-ci/connectors/metadata_service/orchestrator/orchestrator/assets/registry_entry.py.orig
@@ -154,11 +154,8 @@ def apply_generated_fields(metadata_data: dict, metadata_entry: LatestMetadataEn
     Returns:
         dict: The metadata data field with the generated fields applied.
     """
-<<<<<<< HEAD
-=======
 
     # get the generated fields from the metadata data if none, create an empty dictionary
->>>>>>> 46dabe355a (feat(registry): add cdk version)
     generated_fields = metadata_data.get("generated") or {}
 
     # Add the source file metadata

diff --git a/airbyte-integrations/connectors/destination-s3-v2/metadata.yaml b/airbyte-integrations/connectors/destination-s3-v2/metadata.yaml
@@ -1,17 +1,10 @@
 data:
   connectorSubtype: file
   connectorType: destination
-<<<<<<< HEAD
   definitionId: 4816b78f-1489-44c1-9060-4b19d5fa9362
   dockerImageTag: 1.5.0
   dockerRepository: airbyte/destination-s3
   githubIssueLabel: destination-s3
-=======
-  definitionId: d6116991-e809-4c7c-ae09-c64712df5b66
-  dockerImageTag: 0.2.5
-  dockerRepository: airbyte/destination-s3-v2
-  githubIssueLabel: destination-s3-v2
->>>>>>> 7cee0ba437b (Bulk load CDK: test refactors (#48488))
   icon: s3.svg
   license: ELv2
   name: S3