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

    r3e86dee refec285  
    66
    77  <!ENTITY libnma-download-http "&gnome-download-http;/libnma/1.10/libnma-&libnma-version;.tar.xz">
    8   <!ENTITY libnma-download-ftp  "&gnome-download-ftp;/libnma/1.10/libnma-&libnma-version;.tar.xz">
     8  <!ENTITY libnma-download-ftp  " ">
    99  <!ENTITY libnma-md5sum        "71c7ce674fea1fae8f1368a7fcb6ff43">
    1010  <!ENTITY libnma-size          "688 KB">
Note: See TracChangeset for help on using the changeset viewer.