creating conflicts

nrfconnect · Nov 20, 2024 · 8f5b2b9 · 8f5b2b9
1 parent f55af04
commit 8f5b2b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/doc/nrf/includes/application_build_and_run.txt b/doc/nrf/includes/application_build_and_run.txt
@@ -1,5 +1,6 @@
 This application can be found under |application path| in the |NCS| folder structure.
 DUMMY CHANGE
+DUMMY CHANGE2
 To build the application, follow the instructions in :ref:`building` for your preferred building environment.
 See also :ref:`programming` for programming steps and :ref:`testing` for general information about testing and debugging in the |NCS|.
 

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: iNeedConflict
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above