From 351f836652907db6e3db76c880284003f0de94b8 Mon Sep 17 00:00:00 2001
From: bitflash <admin@bitflash.network>
Date: Wed, 12 Aug 2026 10:32:27 -0300
Subject: build: fix leftover merge markers in makefile.mingw (drop FD_SETSIZE,
 keep BITFLASH_NODE_BUILD)

---
 src/makefile.mingw | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/makefile.mingw')

diff --git a/src/makefile.mingw b/src/makefile.mingw
index 4e36a5c..f82247a 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -15,13 +15,8 @@ WARNFLAGS = -Wformat -Werror=format \
             -Wno-narrowing -Wno-unused-result
 
 CXXFLAGS = -std=gnu++14 -O2 $(WARNFLAGS) -fpermissive -pthread \
-<<<<<<< HEAD
            -DWIN32 -DNOPCH \
-           -DSECP256K1_STATIC \
-=======
-           -DWIN32 -DNOPCH -DFD_SETSIZE=1024 \
            -DSECP256K1_STATIC -DBITFLASH_NODE_BUILD \
->>>>>>> origin/main
            -I$(DEPS)/include -I$(RANDOMX)/src \
            -I$(DEPS)/include/nlohmann \
            -IC:/msys64/ucrt64/include \
-- 
cgit v1.2.3