creating conflict

nrfconnect · Nov 21, 2024 · 60a39e2 · 60a39e2
1 parent 9ad927c
commit 60a39e2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/west.yml b/west.yml
@@ -72,7 +72,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr-testing
-      revision: 33919fc981c12469ea96f987c23b90bfa5a8ebea
+      revision: lestMakeConflict
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above