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/glib-networking.xml

    r3e86dee refec285  
    77  <!ENTITY glib-networking-download-http
    88    "&gnome-download-http;/glib-networking/&glib-networking-minor;/glib-networking-&glib-networking-version;.tar.xz">
    9   <!ENTITY glib-networking-download-ftp " ">
    10 <!--  <!ENTITY glib-networking-download-ftp
    11     "&gnome-download-ftp;/glib-networking/2.66/glib-networking-&glib-networking-version;.tar.xz"> -->
     9  <!ENTITY glib-networking-download-ftp  " ">
    1210  <!ENTITY glib-networking-md5sum        "402ff1e8f24dafb02354d9b66ffa11df">
    1311  <!ENTITY glib-networking-size          "280 KB">
Note: See TracChangeset for help on using the changeset viewer.