From f0a1ad536f31a59dd44c16dd90230d242f6ca231 Mon Sep 17 00:00:00 2001 From: Stephanie Smith Date: Thu, 19 Sep 2024 17:59:13 -0700 Subject: [PATCH] resolving remaining conflict --- .../edu/PageEduStudentProject/PageEduStudentProject.stories.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.stories.js b/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.stories.js index afc749b8..270c2cac 100644 --- a/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.stories.js +++ b/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.stories.js @@ -9,11 +9,8 @@ import { BaseVideoData } from './../../../components/BaseVideo/BaseVideo.stories import { BlockVideoEmbedData } from './../../../components/BlockVideoEmbed/BlockVideoEmbed.stories' import { BlockRelatedLinksData } from './../../../components/BlockRelatedLinks/BlockRelatedLinks.stories.js' import { BlockLinkCardCarouselData } from './../../../components/BlockLinkCarousel/BlockLinkCarousel.stories.js' -<<<<<<< HEAD import { RichTextMediaData } from './../../../components/BlockText/BlockText.stories.js' -======= import { BlockRichTableData } from './../../../components/BlockRichTable/BlockRichTable.stories' ->>>>>>> main import { BlockStreamfieldTruncatedData, BlockStreamfieldMinimalData