fix: merge conflict

Author: kabirbatrakb

packages/spec/src/locales.ts

@@ -250,9 +250,7 @@ export const getLocaleCodeDelimiter = (locale: string): LocaleDelimiter => {
   }
 };
 
-
-export const resolveOverridenLocale = (locale: string, delimiter?: LocaleDelimiter): string => {
-
+export const resolveOverriddenLocale = (locale: string, delimiter?: LocaleDelimiter): string => {
   if (!delimiter) {
     return locale;
   }