Skip to content

Commit

Permalink
fix conflicts caused by aftermath of #2058
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewmayer committed May 1, 2023
1 parent 82781ed commit f5eab34
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/locales/en_NG/location/index.ts
Expand Up @@ -3,16 +3,16 @@
* Run 'pnpm run generate:locales' to update.
*/
import type { LocationDefinition } from '../../..';
import city_name from './city_name';
import city_pattern from './city_pattern';
import city_prefix from './city_prefix';
import default_country from './default_country';
import postcode from './postcode';
import state from './state';
import street_pattern from './street_pattern';

const location: LocationDefinition = {
city_name,
city_pattern,
city_prefix,
default_country,
postcode,
state,
Expand Down
4 changes: 2 additions & 2 deletions src/locales/en_ZA/location/index.ts
Expand Up @@ -3,16 +3,16 @@
* Run 'pnpm run generate:locales' to update.
*/
import type { LocationDefinition } from '../../..';
import city_name from './city_name';
import city_pattern from './city_pattern';
import city_prefix from './city_prefix';
import default_country from './default_country';
import postcode from './postcode';
import state from './state';
import street_pattern from './street_pattern';

const location: LocationDefinition = {
city_name,
city_pattern,
city_prefix,
default_country,
postcode,
state,
Expand Down

0 comments on commit f5eab34

Please sign in to comment.