chore: resolve merge conflicts (9bf884cf) · Commits · minerva / frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- External wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

9bf884cf

Commit 9bf884cf authored 6 months ago by Miłosz Grocholewski

Downloads
- Plain Diff

chore: resolve merge conflicts

parents ae74f5cc cbc6edbe

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 0 additions, 424 deletions

package-lock.json
package.json 0 additions, 2 deletions

package.json
src/components/Map/MapViewer/MapViewerVector/utils/shapes/CustomMultiPolygon.test.ts 3 additions, 3 deletions

...r/MapViewerVector/utils/shapes/CustomMultiPolygon.test.ts
src/components/Map/MapViewer/MapViewerVector/utils/shapes/CustomMultiPolygon.ts 2 additions, 2 deletions

...Viewer/MapViewerVector/utils/shapes/CustomMultiPolygon.ts
src/components/Map/MapViewer/MapViewerVector/utils/shapes/getMultiPolygon.test.ts 235 additions, 0 deletions

...ewer/MapViewerVector/utils/shapes/getMultiPolygon.test.ts
src/components/Map/MapViewer/MapViewerVector/utils/shapes/getMultiPolygon.ts 40 additions, 0 deletions

...MapViewer/MapViewerVector/utils/shapes/getMultiPolygon.ts

with 280 additions and 431 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment