Fixed merge conflicts

InteractiveAdvertisingBureau · Jan 9, 2025 · 68afe3d · 68afe3d
1 parent 49a23e0
commit 68afe3d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
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
@@ Expand Up / @@ -47,6 +47,7 @@ export class ConsentLanguages { @@
         'TH',
         'TL',
         'TR',
+        'UK',
         'VI',
         'ZH',
       ]);
@@ Expand Down @@