From 8ce75583f2303c68c4d7a5f058da0eac83a253de Mon Sep 17 00:00:00 2001
From: mirabilos <m@mirbsd.org>
Date: Tue, 12 Nov 2019 19:14:14 +0100
Subject: [PATCH] update and centralise merge status

---
 unicodedomino_kernel_fixup_f4.def | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/unicodedomino_kernel_fixup_f4.def b/unicodedomino_kernel_fixup_f4.def
index bc028c1..3d90add 100644
--- a/unicodedomino_kernel_fixup_f4.def
+++ b/unicodedomino_kernel_fixup_f4.def
@@ -4,9 +4,8 @@
 % this file is dual-licenced under the LPPL version 1.3c or later.
 %-
 % Disallow codepoints outside of the Unicode range [0;10FFFF]; allow
-% "F4 as lead octet.
+% "F4 as lead octet. Fixed upstream v1.2e 2018/09/28
 
-%: fixed upstream
 % bugfix: disallow too large definitions
 \let\unicodedomino@parse@XML@charref\parse@XML@charref%
 \gdef\parse@XML@charref{%
@@ -20,7 +19,6 @@
  \unicodedomino@parse@XML@charref%
 }%
 
-%: also merged
 % bugfix: add "F4 to the list of permitted lead octets
 % (needs the above fix)
 \begingroup%
-- 
GitLab