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/netprogs/samba.xml

    r3e86dee refec285  
    77  <!ENTITY samba-download-http "https://download.samba.org/pub/samba/stable/samba-&samba-version;.tar.gz">
    88  <!ENTITY samba-download-ftp  " ">
    9   <!ENTITY samba-md5sum        "0bcbee83dc1918055873691bb6007838">
     9  <!ENTITY samba-md5sum        "a3941339c16eed4f163b505c55234e4c">
    1010  <!ENTITY samba-size          "40 MB">
    1111  <!ENTITY samba-buildsize     "696 MB (add 73 MB for quicktest)">
Note: See TracChangeset for help on using the changeset viewer.