Fixed merge conflicts

ECN · Feb 3, 2021 · 10de4bd · 10de4bd
2 parents 2595643 + 3edc67a
commit 10de4bd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/components/ItemTable/ItemTable.js b/src/components/ItemTable/ItemTable.js
@@ -71,7 +71,12 @@ export default function ItemTable({ data, rowCanBeSelected }) {
 
     return (
         <TableContainer>
-            <Table {...getTableProps} aria-label="Table of Queue Items" size="small" classes={{ root: classes.tableMargin }}>
+            <Table 
+                {...getTableProps} 
+                aria-label="Table of Queue Items" 
+                size="small" 
+                classes={{ root: classes.tableMargin }}
+            >  
                 <TableHead>
                     {headerGroups.map(headerGroup => (
                         <TableRow {...headerGroup.getHeaderGroupProps()}>
@@ -139,7 +144,7 @@ export default function ItemTable({ data, rowCanBeSelected }) {
                                 {...row.getRowProps()} >
                                 {row.cells.map(cell => (
                                     <TableCell
-                                        classes={{ root: classes.columnBorders, }}
+                                        classes={{ root: classes.columnBorders }}
                                         {...cell.getCellProps()}
                                     >
                                         {cell.render("Cell")}