resolving remaining conflict

nasa-jpl · Sep 20, 2024 · f0a1ad5 · f0a1ad5
1 parent 88563ca
commit f0a1ad5
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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