fix: conflit (2309deba) · Commits · dad / Cines Vitamui · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Cines Vitamui
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2309deba

Commit 2309deba authored 3 years ago by

naji

Downloads
- Patches
- Plain Diff

fix: conflit

parent fdc6fead

No related branches found

No related tags found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

api/api-ingest/pom.xml 0 additions, 1 deletion

api/api-ingest/pom.xml
ui/ui-frontend-common/package.json 1 addition, 1 deletion

ui/ui-frontend-common/package.json
ui/ui-frontend/package-lock.json 1 addition, 1 deletion

ui/ui-frontend/package-lock.json
ui/ui-frontend/projects/pastis/src/app/notice/notice.component.html 6 additions, 19 deletions

...tend/projects/pastis/src/app/notice/notice.component.html
ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts 10 additions, 13 deletions

...rofile/file-tree-metadata/file-tree-metadata.component.ts
ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.ts 1 addition, 0 deletions

...app/profile/edit-profile/file-tree/file-tree.component.ts
ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.ts 12 additions, 12 deletions

...is/src/app/profile/list-profile/list-profile.component.ts
ui/ui-frontend/projects/pastis/src/app/shared/shared.module.ts 2 additions, 4 deletions

...-frontend/projects/pastis/src/app/shared/shared.module.ts

with 33 additions and 51 deletions

0% 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