Skip to content

Commit

Permalink
Merge master into hflatval/react-toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
cognite-bulldozer[bot] authored Jul 5, 2023
2 parents 0741cb5 + 3781901 commit a7461ca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"eslint": "8.44.0",
"eslint-config-prettier": "8.8.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-jsdoc": "46.3.0",
"eslint-plugin-jsdoc": "46.4.3",
"eslint-plugin-lodash": "7.4.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-unused-imports": "2.0.0",
Expand Down
10 changes: 5 additions & 5 deletions viewer/yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a7461ca

Please sign in to comment.