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/netlibs/libsoup.xml

    r3e86dee refec285  
    77  <!ENTITY libsoup-download-http
    88           "&gnome-download-http;/libsoup/&libsoup-minor;/libsoup-&libsoup-version;.tar.xz">
    9   <!ENTITY libsoup-download-ftp
    10            "&gnome-download-ftp;/libsoup/&libsoup-minor;/libsoup-&libsoup-version;.tar.xz">
     9  <!ENTITY libsoup-download-ftp  " ">
    1110  <!ENTITY libsoup-md5sum        "8f657fd301a213629204b3320c35d75a">
    1211  <!ENTITY libsoup-size          "1.4 MB">
Note: See TracChangeset for help on using the changeset viewer.