Fixed merge conflicts

HeinzBaumann · HeinzBaumann · commit 68afe3d54aa7 · 2025-01-09T08:17:47.000-08:00
diff --git a/modules/core/src/model/ConsentLanguages.ts b/modules/core/src/model/ConsentLanguages.ts
@@ -47,6 +47,7 @@ export class ConsentLanguages {
     'TH',
     'TL',
     'TR',
+    'UK',
     'VI',
     'ZH',
   ]);
diff --git a/modules/core/test/model/ConsentLanguages.test.ts b/modules/core/test/model/ConsentLanguages.test.ts
@@ -52,6 +52,7 @@ describe('model->ConsentLanguages', (): void => {
     'TH',
     'TL',
     'TR',
+    'UK',
     'VI',
     'ZH',
   ];

-Original file line number
+Diff line change
     'TH',
     'TL',
     'TR',
 +    'UK',
     'VI',
     'ZH',
   ]);