Skip to content

Commit ffad0b9

Browse files
committed
fix merge miss
1 parent b0afe98 commit ffad0b9

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

packages/documentation/src/stories/raw-components/megadropdown/megadropdown.stories.ts

-6
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,7 @@ export function megadropdownDecorator(story: StoryFn, context: StoryContext) {
8282
</button>
8383
<post-list title-hidden="">
8484
<h2>Main Navigation</h2>
85-
<<<<<<< Updated upstream
8685
<post-list-item> ${story(context.args, context)} </post-list-item>
87-
=======
88-
<post-list-item>
89-
${story(context.args, context)}
90-
</post-list-item>
91-
>>>>>>> Stashed changes
9286
</post-list>
9387
</post-mainnavigation>
9488
</post-header>

0 commit comments

Comments
 (0)