manifest: Update sdk-zephyr revision (auto-manifest PR)

Automatically created by Github Action Signed-off-by: Nordic Builder <[email protected]>
nrfconnect · Nov 7, 2024 · f95c4d5 · f95c4d5
1 parent 4d28fdb
commit f95c4d5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/west.yml b/west.yml
@@ -72,7 +72,11 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
+<<<<<<< HEAD
       revision: 40ac0cca86ebc2a7af34221f643ec616804a02fa
+=======
+      revision: pull/2209/head
+>>>>>>> 8732b9a045 (manifest: Update sdk-zephyr revision (auto-manifest PR))
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above