This is an automated email from the ASF dual-hosted git repository. cederom pushed a commit to branch releases/13.0 in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit ec9fdcf31ab7bdc6ad1dc2dd251f4eecb6a5c13b Author: Alin Jerpelea <[email protected]> AuthorDate: Mon Aug 3 16:38:39 2026 +0200 boards/Kconfig: fix merge conflict 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 <[email protected]> --- boards/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/Kconfig b/boards/Kconfig index 37a827167aa..7f87464f674 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -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
