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/libsoup3.xml

    r3e86dee refec285  
    77  <!ENTITY libsoup3-download-http
    88           "&gnome-download-http;/libsoup/&libsoup3-minor;/libsoup-&libsoup3-version;.tar.xz">
    9   <!ENTITY libsoup3-download-ftp
    10            "&gnome-download-ftp;/libsoup/&libsoup3-minor;/libsoup-&libsoup3-version;.tar.xz">
    11   <!ENTITY libsoup3-md5sum        "3a289bd1f36bb6c326ac5283b26eb2b5">
     9  <!ENTITY libsoup3-download-ftp  " ">
     10  <!ENTITY libsoup3-md5sum        "a63ea04a9686e9e4470b127ffe1eb96b">
    1211  <!ENTITY libsoup3-size          "1.5 MB">
    1312  <!ENTITY libsoup3-buildsize     "38 MB (with tests)">
     
    199198          /usr/include/libsoup-3.0,
    200199          /usr/share/doc/libsoup-&libsoup3-version;
    201           (only installed if -Ddocs=enabled is passed)
     200          (only installed if gi-docgen is available)
    202201        </seg>
    203202      </seglistitem>
Note: See TracChangeset for help on using the changeset viewer.