From 789fd5a5a74923fd613ccccadf304f67d262913a Mon Sep 17 00:00:00 2001
From: Bohdan Horbeshko <bodqhrohro@gmail.com>
Date: Thu, 30 Jul 2026 11:53:02 -0400
Subject: [PATCH] Merge marker hotfix

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index ae0c235..085de11 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ GOTAGS :=
 
 NTG_LIB_DIR ?= /usr/local/lib
 NTG_INC_DIR ?= /usr/local/include
-<<<<<<< HEAD
 
 all:
 	mkdir -p release