From c55d034805afce4362f4a5985e3b87d397a9e968 Mon Sep 17 00:00:00 2001
From: marcosmarxm <marcosmarxm@gmail.com>
Date: Fri, 28 Oct 2022 15:16:39 -0300
Subject: [PATCH] solve conflict

---
 .../resources/seed/source_definitions.yaml    |  7 -----
 .../src/main/resources/seed/source_specs.yaml | 26 -------------------
 2 files changed, 33 deletions(-)

diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
index 33a126256226..dacb38da8567 100644
--- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
+++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
@@ -689,13 +689,6 @@
   icon: mailchimp.svg
   sourceType: api
   releaseStage: generally_available
-- name: Mailjet Mail
-  sourceDefinitionId: 56582331-5de2-476b-b913-5798de77bbdf
-  dockerRepository: airbyte/source-mailjet-mail
-  dockerImageTag: 0.1.0
-  documentationUrl: https://docs.airbyte.com/integrations/sources/mailjet-mail
-  sourceType: api
-  releaseStage: alpha
 - name: MailerLite
   sourceDefinitionId: dc3b9003-2432-4e93-a7f4-4620b0f14674
   dockerRepository: airbyte/source-mailerlite
diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
index de2d93a704ed..e4e087ecb4e0 100644
--- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml
+++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
@@ -6512,32 +6512,6 @@
               path_in_connector_config:
               - "credentials"
               - "client_secret"
-- dockerImage: "airbyte/source-mailjet-mail:0.1.0"
-  spec:
-    documentationUrl: "https://docs.airbyte.com/integrations/sources/mailjet-mail"
-    connectionSpecification:
-      $schema: "http://json-schema.org/draft-07/schema#"
-      title: "Mailjet Mail Spec"
-      type: "object"
-      required:
-      - "api_key"
-      - "api_key_secret"
-      additionalProperties: true
-      properties:
-        api_key:
-          title: "API Key"
-          type: "string"
-          description: "Your API Key. See <a href=\"https://dev.mailjet.com/email/guides/#authentication\"\
-            >here</a>."
-        api_key_secret:
-          title: "API Secret Key"
-          type: "string"
-          description: "Your API Secret Key. See <a href=\"https://dev.mailjet.com/email/guides/#authentication\"\
-            >here</a>."
-          airbyte_secret: true
-    supportsNormalization: false
-    supportsDBT: false
-    supported_destination_sync_modes: []
 - dockerImage: "airbyte/source-mailerlite:0.1.0"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/mailerlite"