Fixed merge errors
parent
2309deba
No related branches found
No related tags found
Showing
- ui/ui-frontend/projects/pastis/src/app/main/main.component.ts 1 addition, 1 deletion...i-frontend/projects/pastis/src/app/main/main.component.ts
- ui/ui-frontend/projects/pastis/src/app/notice/notice.component.ts 9 additions, 0 deletions...ontend/projects/pastis/src/app/notice/notice.component.ts
- ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/edit-profile.component.html 0 additions, 20 deletions.../src/app/profile/edit-profile/edit-profile.component.html
- ui/ui-frontend/projects/pastis/src/app/profile/edit-profile/file-tree/file-tree.component.ts 1 addition, 1 deletion...app/profile/edit-profile/file-tree/file-tree.component.ts
- ui/ui-frontend/projects/pastis/src/app/user-actions/save-profile/save-profile.component.ts 2 additions, 2 deletions...c/app/user-actions/save-profile/save-profile.component.ts
Please register or sign in to comment