Skip to content

Commit

Permalink
[fix](docs): merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
BeeMargarida committed May 13, 2023
1 parent e221093 commit de65559
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion apps/docs/src/lib/components/Sidebar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,18 @@
<li><a href={`${base}/core/tabs`}>Tabs</a></li>
</ul>
</li>
<li>
<strong><Dashboard/><Space w="md" />Data Display</strong>
<ul>
<li><a href={`${base}/core/badge`}>Badge</a></li>
<li><a href={`${base}/core/card`}>Card</a></li>
<li><a href={`${base}/core/image`}>Image</a></li>
<li><a href={`${base}/core/kbd`}>Kbd</a></li>
<li><a href={`${base}/core/theme-icon`}>ThemeIcon</a></li>
<li><a href={`${base}/core/timeline`}>Timeline</a></li>
</ul>
</li>
<li>
<strong><ExclamationTriangle/><Space w="md" />Feedback</strong>
<ul>
<li><a href={`${base}/core/alert`}>Alert</a></li>
Expand Down Expand Up @@ -254,4 +261,3 @@
{/if}
</li>
</ul>

0 comments on commit de65559

Please sign in to comment.