Skip to content

Commit

Permalink
fixing conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
cphelefu committed Sep 13, 2024
1 parent bd4f048 commit b2688e1
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 1 deletion.
51 changes: 50 additions & 1 deletion common/config/rush/pnpm-lock.yaml

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

1 change: 1 addition & 0 deletions packages/geoview-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"@mui/material": "^6.0.2",
"@mui/styles": "^6.0.2",
"@mui/system": "^6.0.2",
"@mui/x-tree-view": "^7.17.0",
"@nieuwlandgeo/sldreader": "^0.3.1",
"@mui/x-date-pickers": "^7.15.0",
"@react-spring/web": "^9.7.3",
Expand Down

0 comments on commit b2688e1

Please sign in to comment.