Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: sdk-zephyr-testing: Rebase onupdates #277

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

manifest: sdk-zephyr-testing: Rebase onupdates #277

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ad927c
west: point at sdk-zephyr-testing
thst-nordic Oct 27, 2024
60a39e2
creating conflict
jaci-nordic Nov 21, 2024
d3d5911
manifest: Update sdk-zephyr-testing revision (auto-manifest PR)
NordicBuilder Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/introduction/index.html
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: d3d3f66845737630687c9018cdb687319b74ec17
repo-path: sdk-zephyr-testing
revision: pull/21/head
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading