fix: resolve merge conflicts + test build fixes

- config.h: remove duplicate nostr_sync fields
- Makefile: add mint_health stub for test_session_payment_method
- test_tollgate_client_mining: inline market_t stub to avoid dependency cascade
- CMakeLists: add negentropy_adapter.c + esp_littlefs + negentropy REQUIRES

1 files changed, 0 insertions, 0 deletions

diff --git a/tests/unit/test_mcp_handler b/tests/unit/test_mcp_handler
index be992f6..e98f2c3 100755
--- a/tests/unit/test_mcp_handler
+++ b/tests/unit/test_mcp_handler