Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
atalyaalon committed May 4, 2024
2 parents facfb4f + 5b179de commit e04ac9d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@material-ui/lab": "^4.0.0-alpha.61",
"@react-leaflet/core": "^1.0.2",
"@types/classnames": "^2.3.1",
"@types/leaflet.heat": "^0.2.0",
"@types/leaflet.heat": "^0.2.4",
"@types/query-string": "^6.3.0",
"@types/tinycolor2": "^1.4.6",
"axios": "^1.6.8",
Expand Down

0 comments on commit e04ac9d

Please sign in to comment.