Skip to content
Snippets Groups Projects
Commit 9d8fa46b authored by couzinie's avatar couzinie Committed by naji
Browse files

Resolve conflit to merge branch 'feat/test' into merge-breadcumb 

Conflicts:
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.html
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree-metadata/file-tree-metadata.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.ts
	ui/ui-frontend/projects/pastis/src/app/profile/list-profile/list-profile.component.ts
parents 2db42e2c c0f7c98b
No related branches found
No related tags found
6 merge requests!58compare branch,!54Comparaison de merge vers vitam-ui,!53Comparaison de merge vers vitam-ui,!52Voir difference entre les deux verion,!41MAJ: compare to vitam-ui,!30BreadCrumb
Hide whitespace changes
Inline Side-by-side
Showing
with 507 additions and 123 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment