fix: bad rebase

Author: shleewhite

showcase/app/templates/components/advanced-table.hbs

@@ -58,7 +58,6 @@
 
   <Shw::Divider />
 
-<<<<<<< HEAD
   <Shw::Text::H2>Nested rows</Shw::Text::H2>
 
   <Shw::Text::H3>With default expanded rows</Shw::Text::H3>
@@ -167,8 +166,6 @@
 
   <Shw::Divider />
 
-=======
->>>>>>> a670452d1 (feat: copy showcase from Table and rework for AdvancedTable)
   <Shw::Text::H2>Sorting</Shw::Text::H2>
 
   <Shw::Text::H3>Basic sorting</Shw::Text::H3>
@@ -942,7 +939,6 @@
 
   <Shw::Text::H2>Base elements</Shw::Text::H2>
 
-<<<<<<< HEAD
   <Shw::Text::H3>Tr</Shw::Text::H3>
 
   <Shw::Text::Body>These examples are for display only, clicking the expand button will not toggle the rows.</Shw::Text::Body>
@@ -1062,8 +1058,6 @@
     </SF.Item>
   </Shw::Flex>
 
-=======
->>>>>>> a670452d1 (feat: copy showcase from Table and rework for AdvancedTable)
   <Shw::Text::H3>ThSort</Shw::Text::H3>
 
   <Shw::Flex @direction="column" @label="Interactive states + Sorting order" as |SF|>
@@ -1157,7 +1151,6 @@
     </SF.Item>
   </Shw::Flex>
 
-<<<<<<< HEAD
   <Shw::Flex @label="Expandable" as |SF|>
     <SF.Item @grow={{true}}>
       <div class="hds-advanced-table" {{style gridTemplateColumns="repeat(4, 1fr)"}}>
@@ -1232,8 +1225,6 @@
     </SF.Item>
   </Shw::Flex>
 
-=======
->>>>>>> a670452d1 (feat: copy showcase from Table and rework for AdvancedTable)
   <Shw::Flex @label="Alignment" as |SF|>
     <SF.Item @grow={{true}}>
       <div class="hds-advanced-table" {{style gridTemplateColumns="repeat(6, 1fr)"}}>
@@ -1699,7 +1690,6 @@
     {{/each}}
   </Shw::Grid>
 
-<<<<<<< HEAD
   <Shw::Divider @level={{2}} />
 
   <Shw::Text::H3>ThButtonExpand</Shw::Text::H3>
@@ -1719,6 +1709,4 @@
     {{/each}}
   </Shw::Grid>
 
-=======
->>>>>>> a670452d1 (feat: copy showcase from Table and rework for AdvancedTable)
 </section>