Solve merge conflicts

Signed-off-by: Antón Casas <[email protected]>

Author: 4ntn

.github/workflows/nightly.yml

@@ -20,31 +20,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
-        zephyr_version: ["zephyr-v3.1.0", "zephyr-v2.7.2"]
-        distro: ["iron", "humble", "rolling"]
-=======
         zephyr_version: ["v4.0.0", "v4.1.0"]
         distro: ["rolling", "jazzy", "humble"]
->>>>>>> 7cbe6da (updates project to work with zephyr v4.0.x (#146))
         include:
           - distro: rolling
             branch: rolling
-<<<<<<< HEAD
-          - distro: humble
-            branch: humble
-          - zephyr_version: zephyr-v2.7.2
-            zephyr_sdk: 0.14.2
-            sdk_filename: zephyr-sdk-$TOOLCHAIN_VERSION\_linux-x86_64_minimal.tar.gz
-          - zephyr_version: zephyr-v3.1.0
-            zephyr_sdk: 0.14.2
-            sdk_filename: zephyr-sdk-$TOOLCHAIN_VERSION\_linux-x86_64_minimal.tar.gz
-=======
           - distro: jazzy
             branch: jazzy
           - distro: humble
             branch: humble
->>>>>>> 7cbe6da (updates project to work with zephyr v4.0.x (#146))
     steps:
       - uses: actions/checkout@v4
         with: