Regenerate UCD

eggrobin · Jan 20, 2024 · b0b4cf6 · b0b4cf6
1 parent e1a01ed
commit b0b4cf6
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/unicodetools/data/ucd/dev/NormalizationTest.txt b/unicodetools/data/ucd/dev/NormalizationTest.txt
@@ -1,9 +1,5 @@
 # NormalizationTest-16.0.0.txt
-<<<<<<< HEAD
-# Date: 2024-01-05, 16:34:31 GMT
-=======
-# Date: 2024-01-18, 12:57:29 GMT
->>>>>>> la-vache/main
+# Date: 2024-01-20, 01:49:31 GMT
 # © 2023 Unicode®, Inc.
 # Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
 # For terms of use, see https://www.unicode.org/terms_of_use.html