Skip to content

Commit

Permalink
Merge branch 'master' into remove-data-table-hover
Browse files Browse the repository at this point in the history
  • Loading branch information
asudoh authored Jan 30, 2020
2 parents 9dcdda6 + 86fa56d commit 92466f5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions packages/bundler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"@babel/core": "^7.7.7",
"@babel/preset-env": "^7.7.7",
"@carbon/cli-reporter": "10.3.0",
"@commitlint/parse": "^8.1.0",
"@commitlint/parse": "^8.3.4",
"autoprefixer": "^9.7.4",
"babel-plugin-macros": "^2.4.2",
Expand All @@ -41,7 +40,6 @@
"inquirer": "^6.5.0",
"klaw-sync": "^6.0.0",
"markdown-toc": "^1.2.0",
"node-sass": "^4.9.4",
"node-sass": "^4.13.1",
"postcss": "^7.0.26",
"postcss-discard-comments": "^4.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default props => (
title="DataTable"
description="With toolbar"
{...getTableContainerProps()}>
<TableToolbar>
<TableToolbar aria-label="data table toolbar">
<TableToolbarContent>
<TableToolbarSearch onChange={onInputChange} />
<TableToolbarMenu>
Expand Down

0 comments on commit 92466f5

Please sign in to comment.