From 55917e09b186c44afc53fc0dd2d3635b34febcd8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 19 May 2026 14:34:12 +0530 Subject: 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 --- tests/unit/test_cvm_server | Bin 45720 -> 45712 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tests/unit/test_cvm_server') diff --git a/tests/unit/test_cvm_server b/tests/unit/test_cvm_server index bd5e735..ea327b7 100755 Binary files a/tests/unit/test_cvm_server and b/tests/unit/test_cvm_server differ -- cgit v1.2.3