* Fix merge conflict issue.

2019-06-16 01:19:15 +08:00 · 2019-06-16 01:19:15 +08:00 · 55eb19acf8
parent 014c151091
commit 55eb19acf8
1 changed files with 0 additions and 4 deletions
--- a/util/arch/archiver.c
+++ b/util/arch/archiver.c
@ -588,10 +588,6 @@ void add(char *name, FILE* ar, FILE* dst, char *mess)
 	member.ar_mode = mode2ar(status.st_mode);
 	member.ar_date = status.st_mtime;
 	member.ar_size = status.st_size;
-<<<<<<< HEAD
->>>>>>> upstream/default
-=======
->>>>>>> upstream/default
 #ifdef DISTRIBUTION
 	if (distr_fl)
 	{