GIT: merge changes from develop

metagentools · Aug 19, 2024 · f90ab23 · f90ab23
1 parent 3387865
commit f90ab23
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.github/workflows/testing_python_app.yml b/.github/workflows/testing_python_app.yml
@@ -14,13 +14,8 @@ jobs:
 
     strategy:
       matrix:
-<<<<<<< HEAD
-        os: [macos-12, ubuntu-latest]
-        python-version: ["3.8", "3.9", "3.10"]
-=======
         os: [macos-latest, ubuntu-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
->>>>>>> develop
 
     steps:
       - uses: "actions/checkout@v3"