d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* Fix merge conflict issue.

Browse source
This commit is contained in:
carl 2019-06-16 01:19:15 +08:00
parent 014c151091
commit 55eb19acf8
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
util/arch/archiver.c
View file

@ -588,10 +588,6 @@ void add(char *name, FILE* ar, FILE* dst, char *mess)
member.ar_mode = mode2ar(status.st_mode); member.ar_mode = mode2ar(status.st_mode);
member.ar_date = status.st_mtime; member.ar_date = status.st_mtime;
member.ar_size = status.st_size; member.ar_size = status.st_size;
<<<<<<< HEAD
>>>>>>> upstream/default
=======
>>>>>>> upstream/default
#ifdef DISTRIBUTION #ifdef DISTRIBUTION
if (distr_fl) if (distr_fl)
{ {