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

    r3e86dee refec285  
    77  <!ENTITY nghttp2-download-http "https://github.com/nghttp2/nghttp2/releases/download/v&nghttp2-version;/nghttp2-&nghttp2-version;.tar.xz">
    88  <!ENTITY nghttp2-download-ftp  " ">
    9   <!ENTITY nghttp2-md5sum        "170885d5d16088bc2abd45f218c2b7e9">
     9  <!ENTITY nghttp2-md5sum        "4601542da69d9657072a3c5529f5c32e">
    1010  <!ENTITY nghttp2-size          "1.5 MB">
    1111  <!ENTITY nghttp2-buildsize     "19 MB">
Note: See TracChangeset for help on using the changeset viewer.