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/mailnews/mutt.xml

    r3e86dee refec285  
    66
    77  <!ENTITY mutt-download-http "https://bitbucket.org/mutt/mutt/downloads/mutt-&mutt-version;.tar.gz">
    8   <!ENTITY mutt-download-ftp  "ftp://ftp.mutt.org/pub/mutt/mutt-&mutt-version;.tar.gz">
     8  <!ENTITY mutt-download-ftp  " ">
    99  <!ENTITY mutt-md5sum        "5b3e1feb8473bf64847d1fd85084dbb0">
    1010  <!ENTITY mutt-size          "5.3 MB">
Note: See TracChangeset for help on using the changeset viewer.