fix: merge errors

2025-08-16 11:21:30 +03:30
parent 696d8fc06b
commit f7207b8545
57 changed files with 451 additions and 688 deletions
--- a/src/features/profile/components/CountryCodeSelector.tsx
+++ b/src/features/profile/components/CountryCodeSelector.tsx
@@ -13,7 +13,7 @@ import { useMemo, useRef, useState, type RefObject } from 'react';
 import { ArrowDown2 } from 'iconsax-react';
 import ReactCountryFlag from 'react-country-flag';
 import { useTranslation } from 'react-i18next';
-import { countries, type Country } from '../data/countries';
+import { countries, type Country } from '@/data/countries';

 interface CountryCodeSelectorProps {
  show: boolean;