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/netutils/bind-utils.xml

    r3e86dee refec285  
    66
    77  <!ENTITY bind-download-http   "https://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
    8   <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.xz">
     8  <!ENTITY bind-download-ftp    " ">
    99  <!ENTITY bind-md5sum          "&bind-md5;">
    1010  <!ENTITY bind-size            "5.3 MB">
Note: See TracChangeset for help on using the changeset viewer.