Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-07 05:27:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

boards/Kconfig: fix merge conflict

Browse source 
merge conflict introduced in master by https://github.com/apache/nuttx/pull/19422
which changed the spaces without a separate commit

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
This commit is contained in:
Alin Jerpelea 2026-08-03 16:38:39 +02:00 • committed by CeDeROM
parent c18c439e0b
commit ec9fdcf31a
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/Kconfig
View file

@ -5600,7 +5600,7 @@ config BOARD_ETC_ROMFS_PASSWD_RANDOMIZE_KEYS
Application Configuration -> File System Utilities ->
Password file support.
comment " If not randomizing: set KEY1..4 at App Config -> File System Utilities -> Password file support"
comment "If not randomizing: set KEY1..4 at App Config -> File System Utilities -> Password file support"
depends on !BOARD_ETC_ROMFS_PASSWD_RANDOMIZE_KEYS
config BOARD_ETC_ROMFS_PASSWD_UID