Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/parlemonde/1village into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
SimNed committed Oct 4, 2023
2 parents 0a32408 + 862ac22 commit 660d315
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/contexts/activityContext.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { Card, CircularProgress } from '@mui/material';

Check failure on line 1 in src/contexts/activityContext.tsx

View workflow job for this annotation

GitHub Actions / lint

There should be at least one empty line between import groups

Check failure on line 1 in src/contexts/activityContext.tsx

View workflow job for this annotation

GitHub Actions / lint

`@mui/material` import should occur after import of `react-query`
import { useRouter } from 'next/router';
import React from 'react';
import { useQueryClient } from 'react-query';

import { Card, CircularProgress } from '@mui/material';

import { UserContext } from './userContext';
import { VillageContext } from './villageContext';
import { Modal } from 'src/components/Modal';
Expand Down

0 comments on commit 660d315

Please sign in to comment.