Skip to content

Commit 38d96aa

Browse files
manifest: Remove submodule option from dragoon source
Removing submodule option. Signed-off-by: alperen sener <alperen.sener@nordicsemi.no>
1 parent f7e5433 commit 38d96aa

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

west.yml

+4
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,12 @@ manifest:
182182
# Only for internal Nordic development
183183
repo-path: dragoon.git
184184
remote: dragoon
185+
<<<<<<< HEAD
185186
revision: 308f61dc07939c69a65449e834fa8588f7e61276
186187
submodules: true
188+
=======
189+
revision: 24f2b7533b443bcb97fd8dae967a5b8ef1ba5afb
190+
>>>>>>> 56d0c3db17 (manifest: Remove submodule option from dragoon source)
187191
groups:
188192
- dragoon
189193
- name: cjson

0 commit comments

Comments
 (0)