potiuk commented on code in PR #46891:
URL: https://github.com/apache/airflow/pull/46891#discussion_r2211833529


##########
dev/breeze/tests/test_selective_checks.py:
##########
@@ -1236,7 +1236,15 @@ def test_excluded_providers():
         {
             "excluded-providers-as-string": json.dumps(
                 {
+<<<<<<< HEAD
                     "3.13": ["apache.beam", "apache.kafka", "fab", "ydb"],
+||||||| parent of d7c0418248 (Pyproject.toml provider changes for Python 3.13)
+                    "3.9": ["cloudant"],
+                    "3.13": ["apache.beam", "apache.kafka", "fab", "ydb"],
+=======
+                    "3.9": ["cloudant"],
+                    "3.13": ["apache.beam", "apache.kafka", "edge3", "fab", 
"yandex", "ydb"],
+>>>>>>> d7c0418248 (Pyproject.toml provider changes for Python 3.13)

Review Comment:
   Yeah. it is - and not worth fixing it in the commit if they are going to be 
merged :)



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to