From 10af616067c659117b25448c9726828b009edcaa Mon Sep 17 00:00:00 2001 From: Parshintsev Anatoly Date: Wed, 29 Nov 2023 20:49:00 +0300 Subject: [PATCH] fix erroneously-resolved merge conflict Change-Id: I4278e3e444eec93c418dfe153f60404f9848a20a Signed-off-by: Parshintsev Anatoly --- src/target/breakpoints.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/target/breakpoints.c b/src/target/breakpoints.c index 44e7274b4..7d2a9da05 100644 --- a/src/target/breakpoints.c +++ b/src/target/breakpoints.c @@ -623,7 +623,7 @@ int watchpoint_remove(struct target *target, target_addr_t address) num_found_watchpoints++; if (status != ERROR_OK) { - LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address); + LOG_TARGET_ERROR(curr, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address); retval = status; } } @@ -635,7 +635,7 @@ int watchpoint_remove(struct target *target, target_addr_t address) num_found_watchpoints++; if (retval != ERROR_OK) - LOG_TARGET_ERROR(target, "failed to remove watchpoint at address" TARGET_ADDR_FMT, address); + LOG_TARGET_ERROR(target, "failed to remove watchpoint at address " TARGET_ADDR_FMT, address); } }