Fix Korean translation

h5p · Dec 13, 2022 · 2b289e0 · 2b289e0
1 parent de4f40d
commit 2b289e0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/language/es-mx.json b/language/es-mx.json
@@ -26,16 +26,12 @@
       }
     },
     {
-<<<<<<< HEAD
-      "label": "Retroalimentación Global",
-=======
       "label": "Distractors",
       "placeholder": "*Reykjavík* *Helsinki*",
       "description": "Enter extra solutions that are wrong as distractors. Use the same asterisk (*) scheme as for the text."
     },
     {
       "label": "Retroalimentación Global",
->>>>>>> b001478 (Update language files to match after rebase)
       "fields": [
         {
           "widgets": [