Ignore:
Timestamp:
11/03/2023 08:46:15 AM (12 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
lazarus
Children:
167c050
Parents:
3e86dee (diff), 3a725a3 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • networking/connect/dhcpcd.xml

    r3e86dee refec285  
    77  <!ENTITY dhcpcd-download-http "https://github.com/NetworkConfiguration/dhcpcd/releases/download/v&dhcpcd-version;/dhcpcd-&dhcpcd-version;.tar.xz">
    88  <!ENTITY dhcpcd-download-ftp  " ">
    9   <!ENTITY dhcpcd-md5sum        "1f266e2c32567bc778ea22c599fb06d9">
    10   <!ENTITY dhcpcd-size          "260 KB">
    11   <!ENTITY dhcpcd-buildsize     "3.1 MB (with tests)">
     9  <!ENTITY dhcpcd-md5sum        "3e99fcd70276cb20a2e8cd63b26125ed">
     10  <!ENTITY dhcpcd-size          "263 KB">
     11  <!ENTITY dhcpcd-buildsize     "3.0 MB (with tests)">
    1212  <!ENTITY dhcpcd-time          "less than 0.1 SBU (with tests)">
    1313]>
Note: See TracChangeset for help on using the changeset viewer.