resolved conflicts

ohcnetwork · Jan 17, 2025 · b52df97 · b52df97
1 parent 785a4ab
commit b52df97
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/components/ErrorPages/DefaultErrorPage.tsx b/src/components/ErrorPages/DefaultErrorPage.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
 import { Button } from "@/components/ui/button";
+
 import useAppHistory from "@/hooks/useAppHistory";
 
 type ErrorType = "PAGE_NOT_FOUND" | "PAGE_LOAD_ERROR" | "CUSTOM_ERROR";

diff --git a/src/components/Questionnaire/index.tsx b/src/components/Questionnaire/index.tsx
@@ -6,7 +6,6 @@ import { Button } from "@/components/ui/button";
 
 import Loading from "@/components/Common/Loading";
 
-import useQuery from "@/Utils/request/useQuery";
 import query from "@/Utils/request/query";
 import { QuestionnaireDetail } from "@/types/questionnaire/questionnaire";
 import questionnaireApi from "@/types/questionnaire/questionnaireApi";