removed merge error

mui · Mar 21, 2019 · ae3fc37 · ae3fc37
1 parent abdb2c9
commit ae3fc37
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/docs/src/pages/demos/tables/SimpleTable.tsx b/docs/src/pages/demos/tables/SimpleTable.tsx
@@ -20,15 +20,8 @@ const styles = (theme: Theme) =>
     },
   });
 
-<<<<<<< HEAD
-let id = 0;
-function createData(name: string, calories: number, fat: number, carbs: number, protein: number) {
-  id += 1;
-  return { id, name, calories, fat, carbs, protein };
-=======
 function createData(name: string, calories: number, fat: number, carbs: number, protein: number) {
   return { name, calories, fat, carbs, protein };
->>>>>>> 0431101a3435c72ee99646db5e09ffedc7830858
 }
 
 const rows = [
@@ -58,11 +51,7 @@ function SimpleTable(props: SimpleTableProps) {
         </TableHead>
         <TableBody>
           {rows.map(row => (
-<<<<<<< HEAD
-            <TableRow key={row.id}>
-=======
             <TableRow key={row.name}>
->>>>>>> 0431101a3435c72ee99646db5e09ffedc7830858
               <TableCell component="th" scope="row">
                 {row.name}
               </TableCell>