From a58ad2bc31f5c902b11c49dbc4b3e30aaeb465c2 Mon Sep 17 00:00:00 2001
From: carl <cecodere@yahoo.ca>
Date: Sun, 24 Mar 2019 23:36:52 +0800
Subject: [PATCH] * Adapt to more ANSI C

---
 util/arch/archiver.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/util/arch/archiver.c b/util/arch/archiver.c
index f216262fb..1353fa1be 100644
--- a/util/arch/archiver.c
+++ b/util/arch/archiver.c
@@ -553,7 +553,6 @@ void get(int argc, char *argv[])
  */
 void add(char *name, FILE* ar, FILE* dst, char *mess)
 {
-<<<<<<< HEAD
 	static MEMBER member;
 	size_t read_chars;
 	struct stat status;