fix: merge conflicts

DistributedCollective · Oct 12, 2023 · cc43838 · cc43838
1 parent 790af4a
commit cc43838
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/apps/frontend/src/app/5_pages/BitocracyPage/components/ProposalStatus/ProposalStatus.tsx b/apps/frontend/src/app/5_pages/BitocracyPage/components/ProposalStatus/ProposalStatus.tsx
@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React, { FC, useMemo } from 'react';
 
 import classNames from 'classnames';
 import { t } from 'i18next';