fix: fix bad merge

dhis2 · Nov 27, 2023 · 0d194e8 · 0d194e8
1 parent ea15bc9
commit 0d194e8
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/src/components/sectionList/SectionList.module.css b/src/components/sectionList/SectionList.module.css
@@ -9,12 +9,6 @@
     gap: var(--spacers-dp8);
 }
 
-<<<<<<< HEAD
-.listToolbarWrapper {
-    display: flex;
-    flex-direction: column;
-    grid-area: 'list';
-=======
 .list {
     grid-area: list;
 }
@@ -23,21 +17,15 @@
     display: flex;
     flex-direction: column;
     grid-area: list;
->>>>>>> master
 }
 
 .listDetailsWrapper {
     display: grid;
     grid-template-columns: 1fr auto;
-<<<<<<< HEAD
-    grid-template-rows: none;
-    grid-template-areas: 'list details';
-=======
     grid-template-rows: auto;
     grid-template-areas:
         'header details'
         'list details';
->>>>>>> master
     margin-top: var(--spacers-dp8);
 }
 
@@ -46,14 +34,10 @@
         display: grid;
         grid-template-rows: auto;
         grid-template-columns: none;
-<<<<<<< HEAD
-        grid-template-areas: 'list' 'details';
-=======
         grid-template-areas:
             'header'
             'list'
             'details';
->>>>>>> master
         margin-top: var(--spacers-dp8);
     }
 }