updated conflicts

digitalnsw · Dec 2, 2019 · e13dd09 · e13dd09
1 parent 2ac3928
commit e13dd09
Showing 1 changed file with 0 additions and 26 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -33,19 +33,14 @@
 <h1>Styleguide</h1>
   <h2>Components</h2>
   <ul>
-<<<<<<< Updated upstream
     <li><a class="navigation-nav-item" href="components/notification/index.html" target="_blank">Notification [INCOMPLETE]</a></li>
     <li><a class="navigation-nav-item" href="components/accordion/index.html" target="_blank">Accordion [INCOMPLETE]</a></li>
     <li><a class="navigation-nav-item" href="components/blockquote/index.html" target="_blank">Blockquote</a></li>
     <li><a class="navigation-nav-item" href="components/button/index.html" target="_blank">Buttons</a></li>
     <li><a class="navigation-nav-item" href="components/callout/index.html" target="_blank">Callout [INCOMPLETE]</a></li>
     <li><a class="navigation-nav-item" href="components/direction-links/index.html" target="_blank">Direction Links [INCOMPLETE]</a></li>
-=======
->>>>>>> Stashed changes
     <li><a class="navigation-nav-item" href="components/hero-banner/index.html" target="_blank">Hero Banner</a></li>
-    <li><a class="navigation-nav-item" href="components/button/index.html" target="_blank">Buttons</a></li>
     <li><a class="navigation-nav-item" href="components/card/index.html" target="_blank">Card [INCOMPLETE]</a></li>
-<<<<<<< Updated upstream
     <li><a class="navigation-nav-item" href="components/breadcrumbs/index.html" target="_blank">Breadcrumbs</a></li>
     <li><a class="navigation-nav-item" href="components/link-list/index.html" target="_blank">Link list</a></li>
     <li><a class="navigation-nav-item" href="components/site-wide-message/index.html" target="_blank">Site wide message [INCOMPLETE]</a></li>
@@ -55,22 +50,7 @@ <h2>Components</h2>
     <li><a class="navigation-nav-item" href="components/social-bar/index.html" target="_blank">Social bar [INCOMPLETE]</a></li>
     <li><a class="navigation-nav-item" href="components/side-navigation/index.html" target="_blank">Side navigation [INCOMPLETE]</a></li>
     <li><a class="navigation-nav-item" href="components/tags/index.html" target="_blank">Tags [INCOMPLETE]</a></li>
-=======
-    <li><a class="navigation-nav-item" href="components/blockquote/index.html" target="_blank">Blockquote</a></li>
-    <li><a class="navigation-nav-item" href="components/breadcrumbs/index.html" target="_blank">Breadcrumbs</a></li>
-    <li><a class="navigation-nav-item" href="components/direction-links/index.html" target="_blank">Direction Links [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/callout/index.html" target="_blank">Callout [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/in-page-navigation/index.html" target="_blank">In-page Navigation [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/accordion/index.html" target="_blank">Accordion [INCOMPLETE]</a></li>
     <li><a class="navigation-nav-item" href="components/link-list/index.html" target="_blank">Link list</a></li>
-    <li><a class="navigation-nav-item" href="components/side-navigation/index.html" target="_blank">Side navigation [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/notification/index.html" target="_blank">Notification [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/pagination/index.html" target="_blank">Pagination [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/social-bar/index.html" target="_blank">Social bar [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/site-wide-message/index.html" target="_blank">Site wide message [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/tags/index.html" target="_blank">Tags [INCOMPLETE]</a></li>
-    <li><a class="navigation-nav-item" href="components/tab-navigation/index.html" target="_blank">Tab navigation [INCOMPLETE]</a></li>
->>>>>>> Stashed changes
   </ul>
   <h2>Patterns</h2>
   <ul>
@@ -80,15 +60,9 @@ <h2>Patterns</h2>
   <h2>Styles</h2>
   <ul>
     <li><a class="navigation-nav-item" href="styles/forms/index.html" target="_blank">Forms [INCOMPLETE]</a></li>
-<<<<<<< Updated upstream
     <li><a class="navigation-nav-item" href="styles/grid/index.html" target="_blank">Grid</a></li>
     <li><a class="navigation-nav-item" href="styles/tables/index.html" target="_blank">Tables [INCOMPLETE]</a></li>
     <li><a class="navigation-nav-item" href="styles/iconography/index.html" target="_blank">Iconography</a></li>
-=======
-    <li><a class="navigation-nav-item" href="styles/iconography/index.html" target="_blank">Iconography</a></li>
-    <li><a class="navigation-nav-item" href="styles/grid/index.html" target="_blank">Grid</a></li>
-    <li><a class="navigation-nav-item" href="styles/tables/index.html" target="_blank">Tables [INCOMPLETE]</a></li>
->>>>>>> Stashed changes
     <li><a class="navigation-nav-item" href="styles/typography/index.html" target="_blank">Typography</a></li>
   </ul>
 </div>