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
  • server/mail/postfix.xml

    r3e86dee refec285  
    99  mirror status, some of the mirrors shown as http are actually https -->
    1010  <!ENTITY postfix-download-http "https://ghostarchive.org/postfix/postfix-release/official/postfix-&postfix-version;.tar.gz">
    11   <!ENTITY postfix-download-ftp  "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
     11  <!ENTITY postfix-download-ftp  " ">
    1212  <!ENTITY postfix-md5sum        "3e9d80bbbb692693f4172d465c08c893">
    1313  <!ENTITY postfix-size          "4.6 MB">
Note: See TracChangeset for help on using the changeset viewer.