bring back apply_python_development_overrides test (airbytehq/airby…

…te-internal-issues#10779)
airbytehq · Dec 6, 2024 · 48c6381 · 48c6381
1 parent 026c434
commit 48c6381
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/airbyte-ci/connectors/pipelines/pyproject.toml b/airbyte-ci/connectors/pipelines/pyproject.toml
@@ -4,7 +4,6 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pipelines"
-<<<<<<< HEAD
 version = "4.44.0"
 description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
 authors = ["Airbyte <[email protected]>"]