diff --git a/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/spec.py b/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/spec.py
index b493c4c993104..ee9b686befb6b 100644
--- a/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/spec.py
+++ b/airbyte-integrations/connectors/source-facebook-marketing/source_facebook_marketing/spec.py
@@ -61,15 +61,7 @@ class Config:
end_date: Optional[datetime] = Field(
title="End Date",
-<<<<<<< HEAD
description="The field is the date until which to pull data. If not specified, we will use the latest data available.",
-=======
- description=(
- "The date until which you'd like to replicate data for this stream, in the format YYYY-MM-DDT00:00:00Z. "
- "All data generated between the start date and this end date will be replicated. "
- "Not setting this option will result in always syncing the latest data."
- ),
->>>>>>> upstream/master
pattern=DATE_TIME_PATTERN,
examples=["2017-01-26T00:00:00Z"],
)
@@ -100,16 +92,7 @@ def schema_extra(schema: Dict[str, Any], model: Type["ConnectorConfig"]) -> None
account_id: str = Field(
title="Account ID",
-<<<<<<< HEAD
order=1,
-=======
- order=0,
- description=(
- "The Facebook Ad account ID to use when pulling data from the Facebook Marketing API."
- " Open your Meta Ads Manager. The Ad account ID number is in the account dropdown menu or in your browser's address bar. "
- 'See the docs for more information.'
- ),
->>>>>>> upstream/master
examples=["111111111111111"],
)
@@ -122,45 +105,17 @@ def schema_extra(schema: Dict[str, Any], model: Type["ConnectorConfig"]) -> None
end_date: Optional[datetime] = Field(
title="End Date",
-<<<<<<< HEAD
description="The field is the date until which to pull data. If not specified, we will use the latest data available.",
order=3,
-=======
- order=2,
- description=(
- "The date until which you'd like to replicate data for all incremental streams, in the format YYYY-MM-DDT00:00:00Z."
- " All data generated between the start date and this end date will be replicated. "
- "Not setting this option will result in always syncing the latest data."
- ),
->>>>>>> upstream/master
pattern=EMPTY_PATTERN + "|" + DATE_TIME_PATTERN,
examples=["2017-01-26T00:00:00Z"],
default_factory=lambda: datetime.now(tz=timezone.utc),
)
-<<<<<<< HEAD
-=======
- access_token: str = Field(
- title="Access Token",
- order=3,
- description=(
- "The value of the generated access token. "
- 'From your App’s Dashboard, click on "Marketing API" then "Tools". '
- 'Select permissions ads_management, ads_read, read_insights, business_management. Then click on "Get token". '
- 'See the docs for more information.'
- ),
- airbyte_secret=True,
- )
-
->>>>>>> upstream/master
include_deleted: bool = Field(
title="Include Deleted Campaigns, Ads, and AdSets",
order=4,
default=False,
-<<<<<<< HEAD
-=======
- description="Set to active if you want to include data from deleted Campaigns, Ads, and AdSets.",
->>>>>>> upstream/master
)
fetch_thumbnail_images: bool = Field(
@@ -183,27 +138,11 @@ def schema_extra(schema: Dict[str, Any], model: Type["ConnectorConfig"]) -> None
title="Page Size of Requests",
order=7,
default=100,
-<<<<<<< HEAD
-=======
- description=(
- "Page size used when sending requests to Facebook API to specify number of records per page when response has pagination. "
- "Most users do not need to set this field unless they specifically need to tune the connector to address specific issues or use cases."
- ),
->>>>>>> upstream/master
)
insights_lookback_window: Optional[PositiveInt] = Field(
title="Insights Lookback Window",
order=8,
-<<<<<<< HEAD
-=======
- description=(
- "The attribution window. Facebook freezes insight data 28 days after it was generated, "
- "which means that all data from the past 28 days may have changed since we last emitted it, "
- "so you can retrieve refreshed insights from the past by setting this parameter. "
- "If you set a custom lookback window value in Facebook account, please provide the same value here."
- ),
->>>>>>> upstream/master
maximum=28,
mininum=1,
default=28,
@@ -212,13 +151,6 @@ def schema_extra(schema: Dict[str, Any], model: Type["ConnectorConfig"]) -> None
max_batch_size: Optional[PositiveInt] = Field(
title="Maximum size of Batched Requests",
order=9,
-<<<<<<< HEAD
-=======
- description=(
- "Maximum batch size used when sending batch requests to Facebook API. "
- "Most users do not need to set this field unless they specifically need to tune the connector to address specific issues or use cases."
- ),
->>>>>>> upstream/master
default=50,
)
diff --git a/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py b/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py
index 4bbc95b854d72..97d2c8d51337f 100644
--- a/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py
+++ b/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py
@@ -201,7 +201,6 @@
"UriEvent",
]
-<<<<<<< HEAD
RESOURCE_PRIMARY_KEY_MAP = {
"PlatformEventUsageMetric": None, # PlatformEventUsageMetric does not have a primary key
"FormulaFunctionAllowedType": "DurableId", # https://developer.salesforce.com/docs/atlas.en-us.object_reference.meta/object_reference/sforce_api_objects_formulafunctionallowedtype.htm
@@ -211,9 +210,7 @@
"Publisher": "DurableId", # https://developer.salesforce.com/docs/atlas.en-us.api_tooling.meta/api_tooling/tooling_api_objects_publisher.htm
"ApexPageInfo": "DurableId" # https://developer.salesforce.com/docs/atlas.en-us.api_tooling.meta/api_tooling/tooling_api_objects_apexpageinfo.htm
}
-=======
UNSUPPORTED_STREAMS = ["ActivityMetric", "ActivityMetricRollup"]
->>>>>>> upstream/master
class Salesforce:
diff --git a/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py b/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py
index 4a3cffcfdcd78..1bfc1906233bb 100644
--- a/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py
+++ b/airbyte-integrations/connectors/source-stripe/source_stripe/streams.py
@@ -12,12 +12,7 @@
from airbyte_cdk.models import SyncMode
from airbyte_cdk.sources.streams.availability_strategy import AvailabilityStrategy
from airbyte_cdk.sources.streams.http import HttpStream
-<<<<<<< HEAD
-from airbyte_cdk.sources.streams import IncrementalMixin
-from datetime import datetime
-=======
from source_stripe.availability_strategy import StripeSubStreamAvailabilityStrategy
->>>>>>> upstream/master
STRIPE_ERROR_CODES: List = [
# stream requires additional permissions