* Adapt to more ANSI C

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;