Changeset 1be8fad for postlfs/filesystems/btrfs-progs.xml

Timestamp:

05/11/2021 08:46:29 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

2eb6c62

Parents:

4b1b4784 (diff), 7c934e69 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fix merge conflict

File:

• postlfs/filesystems/btrfs-progs.xml (modified) (1 diff)

postlfs/filesystems/btrfs-progs.xml

@@ -7 +7 @@
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "7a8d0201da222c838a89fb31511f8d86">
+  <!ENTITY btrfs-progs-md5sum        "e3de33b782142dd21a74e6adfb17627a">
   <!ENTITY btrfs-progs-size          "2.1 MB">
-  <!ENTITY btrfs-progs-buildsize     "93 MB (up to 2.7 GB are used during tests)">
+  <!ENTITY btrfs-progs-buildsize     "63 MB (up to 2.7 GB are used during tests)">
   <!ENTITY btrfs-progs-time          "0.2 SBU (add 50-100 SBU for tests, depending on disk speed)">
 ]>