This is an automated email from the ASF dual-hosted git repository.

rskraba pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/branch-1.11 by this push:
     new cf40fb9d34 AVRO-4205: [build] Merge tags in yml (#3558)
cf40fb9d34 is described below

commit cf40fb9d34b0af54d21df60eda78cf5cc5395af6
Author: Ryan Skraba <[email protected]>
AuthorDate: Mon Nov 17 19:21:26 2025 +0100

    AVRO-4205: [build] Merge tags in yml (#3558)
---
 .github/workflows/test-lang-py.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/workflows/test-lang-py.yml 
b/.github/workflows/test-lang-py.yml
index 08e319a99f..aba38f4059 100644
--- a/.github/workflows/test-lang-py.yml
+++ b/.github/workflows/test-lang-py.yml
@@ -88,17 +88,8 @@ jobs:
         - '3.10'
         - '3.9'
         - '3.8'
-<<<<<<< HEAD
         - '3.7'
-<<<<<<< HEAD
-        - '3.6'
-        - 'pypy-3.7'
-        - 'pypy-3.6'
-=======
-=======
->>>>>>> 6e5e37876b (Drop apparently unsupported pypy version)
         - 'pypy-3.10'
->>>>>>> 982ad792ce (ci: Remove deprecated pypy-3.9 test (#3211))
 
     steps:
       - uses: actions/checkout@v4

Reply via email to