Again...

Author: clin1234

Misc/NEWS.d/next/Library/2026-03-23-20-37-02.gh-issue-146343.JnXJVB.rst

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 Add the following MIME types with file extensions:
 
@@ -22,3 +23,28 @@ Add the following MIME types with file extensions:
   - ``.gv``     : ``text/vnd.graphviz``
   - ``.wgsl``   : ``text/wgsl``
   - ``.ent``    : ``text/xml-external-parsed-entity``
+=======
+Add the following MIME types with file extensions:
+
+  - ``.appcache`` and ``.manifest`` for ``text/cache-manifest``
+  - ``.ics`` and ``.ifb``    for ``text/calendar``
+  - ``.cql``    for ``text/cql``
+  - ``.csvs``   for ``text/csv-schema``
+  - ``.gff3``   for ``text/gff3``
+  - ``.cnd``    for ``text/jcr-cnd``
+  - ``.miz``    for ``text/mizar``
+  - ``.org``    for ``text/org``
+  - ``.provn``  for ``text/provenance-notation``
+  - ``.shaclc`` and ``.shc``    for ``text/shaclc``
+  - ``.shex``   for ``text/shex``
+  - ``.spdx``   for ``text/spdx``
+  - ``.ttl``    for ``text/turtle``
+  - ``.uri``  and ``.uris``   for ``text/uri-list``
+  - ``.vcard`` and ``.vcf``    for ``text/vcard``
+  - ``.ascii``  for ``text/vnd.ascii-art``
+  - ``.curl``   for ``text/vnd.curl``
+  - ``.gml``    for ``text/vnd.gml``
+  - ``.gv``     for ``text/vnd.graphviz``
+  - ``.wgsl``   for ``text/wgsl``
+  - ``.ent``    for ``text/xml-external-parsed-entity``
+>>>>>>> 78179ae902 (Again...)