resolve conflicts (5b145f16) · Commits · EOSC-Pillar / FFDS / FFDS-register-front · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

FFDS-register-front
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

5b145f16

Commit 5b145f16 authored 3 years ago by Baptiste Toulemonde

Downloads
- Plain Diff

resolve conflicts

parents f3e42772 45e2a2e3

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/app/mapping/mapping.component.ts 80 additions, 44 deletions

src/app/mapping/mapping.component.ts
src/app/publishapi/publishapi.component.ts 3 additions, 2 deletions

src/app/publishapi/publishapi.component.ts
src/app/stats/stats.component.ts 1 addition, 1 deletion

src/app/stats/stats.component.ts

with 84 additions and 47 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