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, 2 deletions

diff --git a/main/config.h b/main/config.h
index 9463845..50f7efb 100644
--- a/main/config.h
+++ b/main/config.h
@@ -81,8 +81,6 @@ typedef struct {
 
     char nostr_seed_relays[TOLLGATE_MAX_SEED_RELAYS][128];
     int nostr_seed_relay_count;
-    int nostr_sync_interval_s;
-    int nostr_fallback_sync_interval_s;
 
     bool market_enabled;
     int market_scan_interval_s;