Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
CRCunha committed Mar 20, 2021
2 parents b9a49cd + 1431e61 commit 75058d1
Show file tree
Hide file tree
Showing 12 changed files with 1,432 additions and 176 deletions.
6 changes: 3 additions & 3 deletions .vscode/bookmarks.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"files": [
{
"path": "src/components/pages/homePage/content/index.js",
"path": "src/components/menu/index.js",
"bookmarks": [
{
"line": 164,
"column": 76,
"line": 31,
"column": 35,
"label": ""
}
]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ install: ;@echo "Installing ${PROJECT}....."; \
npm install

clean : ;
rm -rf node_modules
rm -rf node_modules
138 changes: 138 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"@nivo/pie": "^0.67.0",
"@nivo/radar": "^0.67.0",
"@nivo/stream": "^0.67.0",
"@nivo/swarmplot": "^0.67.0",
"@nivo/waffle": "^0.67.0",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
Expand Down
Loading

0 comments on commit 75058d1

Please sign in to comment.