* Adapt to more ANSI C

2019-03-24 23:36:52 +08:00 · 2019-03-24 23:36:52 +08:00 · a58ad2bc31
parent da0e0ac257
commit a58ad2bc31
1 changed files with 0 additions and 1 deletions
--- 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;