diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-12-27 08:21:55 +0000 |
| commit | b15f68214da209b5b293039c09c00f490c0cc193 (patch) | |
| tree | d644b5d9318b79cb1baa356cbb63318cc4872c05 /include/bb_archive.h | |
| parent | 1ee308c75f4720ee38be8e81ff8c9ed4c52670d4 (diff) | |
| parent | 44075929a8b9c1861d15564fa6ac4562abb724d7 (diff) | |
| download | busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.gz busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.tar.bz2 busybox-w32-b15f68214da209b5b293039c09c00f490c0cc193.zip | |
Merge busybox into merge
Fix merge conflict in coreutils/timeout.c.
Diffstat (limited to 'include/bb_archive.h')
| -rw-r--r-- | include/bb_archive.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/bb_archive.h b/include/bb_archive.h index 3bbe8af41..3422c9656 100644 --- a/include/bb_archive.h +++ b/include/bb_archive.h | |||
| @@ -205,7 +205,6 @@ char get_header_ar(archive_handle_t *archive_handle) FAST_FUNC; | |||
| 205 | char get_header_cpio(archive_handle_t *archive_handle) FAST_FUNC; | 205 | char get_header_cpio(archive_handle_t *archive_handle) FAST_FUNC; |
| 206 | char get_header_tar(archive_handle_t *archive_handle) FAST_FUNC; | 206 | char get_header_tar(archive_handle_t *archive_handle) FAST_FUNC; |
| 207 | char get_header_tar_gz(archive_handle_t *archive_handle) FAST_FUNC; | 207 | char get_header_tar_gz(archive_handle_t *archive_handle) FAST_FUNC; |
| 208 | char get_header_tar_xz(archive_handle_t *archive_handle) FAST_FUNC; | ||
| 209 | char get_header_tar_bz2(archive_handle_t *archive_handle) FAST_FUNC; | 208 | char get_header_tar_bz2(archive_handle_t *archive_handle) FAST_FUNC; |
| 210 | char get_header_tar_lzma(archive_handle_t *archive_handle) FAST_FUNC; | 209 | char get_header_tar_lzma(archive_handle_t *archive_handle) FAST_FUNC; |
| 211 | char get_header_tar_xz(archive_handle_t *archive_handle) FAST_FUNC; | 210 | char get_header_tar_xz(archive_handle_t *archive_handle) FAST_FUNC; |