More commit cleanup

kjd · May 8, 2023 · 04961c0 · 04961c0
1 parent b300945
commit 04961c0
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/idna/idnadata.py b/idna/idnadata.py
@@ -1709,7 +1709,6 @@
         0x30a1000030fb,
         0x30fc000030ff,
         0x310500003130,
-<<<<<<< Updated upstream
         0x31a0000031c0,
         0x31f000003200,
         0x340000004dc0,
@@ -2069,7 +2068,6 @@
         0x102800001029D,
         0x102A0000102D1,
         0x102E0000102E1,
->>>>>>> Stashed changes
         0x1030000010320,
         0x1032d00010341,
         0x103420001034a,
@@ -2243,7 +2241,6 @@
         0x1300000013430,
         0x1344000013456,
         0x1440000014647,
-<<<<<<< Updated upstream
         0x1680000016a39,
         0x16a4000016a5f,
         0x16a6000016a6a,
@@ -2400,7 +2397,6 @@
     ),
     "CONTEXTO": (
         0xB7000000B8,
->>>>>>> Stashed changes
         0x37500000376,
         0x5f3000005f5,
         0x6600000066a,

diff --git a/idna/uts46data.py b/idna/uts46data.py
@@ -5210,7 +5210,6 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
 
 def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-<<<<<<< Updated upstream
     (0xFE5E, 'M', '〕'),
     (0xFE5F, '3', '#'),
     (0xFE60, '3', '&'),
@@ -5412,7 +5411,6 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFF18, "M", "8"),
         (0xFF19, "M", "9"),
         (0xFF1A, "3", ":"),
->>>>>>> Stashed changes
     ]
 
 def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
@@ -8535,7 +8533,6 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0x2F9D5, 'M', '賁'),
     ]
 
-<<<<<<< Updated upstream
 def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
     (0x2F9D6, 'M', '贛'),
@@ -8618,8 +8615,6 @@ def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     (0xE01F0, 'X'),
     ]
 
-=======
->>>>>>> Stashed changes
 uts46data = tuple(
     _seg_0()
     + _seg_1()