From b25da21fd12a4038d63f3f3b9a602c318f684cc7 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 28 Jan 2023 09:58:32 +0100
Subject: [PATCH] chore: fix merge marker in makefile

---
 Makefile  | 8 ++------
 README.md | 4 ++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index ac56c97..f3059a7 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ BINS_TEST := $(OBJS_TEST:%.c.o=%)
 TARGETS_TEST := $(BINS_TEST:%=test-%)
 TARGETS_MEM_TEST := $(BINS_TEST:%=test-mem-%)
 
+LIBFLAGS := -larchive
 INC_FLAGS := $(addprefix -I,$(INC_DIRS))
 
 # -MMD: generate a .d file for every source file. This file can be imported by
@@ -71,14 +72,9 @@ build-test: $(BINS_TEST)
 
 # For simplicity, we link every object file to each of the test files. This
 # might be changed later if this starts to become too slow.
-<<<<<<< HEAD
 $(BINS_TEST): %: %.c.o $(LIB)
 	$(CC) \
-		$^ -o $@
-=======
-$(BINS_TEST): %: %.c.o $(OBJS)
-	$(CC) $^ -larchive -o $@
->>>>>>> c94ab92 (refactor: Add libarchive link to test compilation area of the Makefile. Created test units with xcursor-dmz as test package.)
+		$^ $(LIBFLAGS) -o $@
 
 # Along with the include directory, each test includes $(TEST_DIR) (which
 # contains the acutest.h header file), and the src directory of the module it's
diff --git a/README.md b/README.md
index d1fef1a..448b87b 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,10 @@ See the [source code](src) for the list of modules.
 Everything is handled by the provided Makefile. To compile the static library,
 simply run `make`.
 
+### Required libraries
+
+Libvieter requires libarchive.
+
 ### Project structure
 
 Each module has its own subdirectory inside `src`, e.g. `src/cron`. This