Resolve merge conflicts

bcgov · May 21, 2024 · 98ddbf2 · 98ddbf2
1 parent 4d49efa
commit 98ddbf2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/app/src/db/prisma/schema.prisma b/app/src/db/prisma/schema.prisma
@@ -215,9 +215,3 @@ model user {
   @@index([identity_id], map: "user_identity_id_index")
   @@index([username], map: "user_username_index")
 }
-
-enum yes_no_unsure {
-  Yes
-  No
-  Unsure
-}
diff --git a/frontend/src/components/intake/ShasIntakeForm.vue b/frontend/src/components/intake/ShasIntakeForm.vue
@@ -16,6 +16,7 @@ import {
   StepperNavigation,
   TextArea
 } from '@/components/form';
+import { intakeSchema } from '@/components/intake/ShasIntakeSchema';
 import {
   Accordion,
   AccordionTab,
@@ -40,8 +41,6 @@ import {
   YesNoUnsure
 } from '@/utils/constants';
 import { BASIC_RESPONSES, INTAKE_FORM_CATEGORIES, PROJECT_LOCATION } from '@/utils/enums';
-import { deepToRaw } from '@/utils/utils';
-import { intakeSchema } from './ShasIntakeSchema';
 
 import type { Ref } from 'vue';
 

diff --git a/frontend/tests/unit/components/shasIntake/ShasIntakeForm.spec.ts b/frontend/tests/unit/components/shasIntake/ShasIntakeForm.spec.ts
@@ -1,6 +1,5 @@
 import { createTestingPinia } from '@pinia/testing';
 import { mount, RouterLinkStub } from '@vue/test-utils';
-import { nextTick } from 'vue';
 
 import ShasIntakeForm from '@/components/intake/ShasIntakeForm.vue';
 import { intakeSchema } from '@/components/intake/ShasIntakeSchema';