Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

6510c5e4

Commit 6510c5e4 authored 4 years ago by Jérémie BRISON

Downloads
- Patches
- Plain Diff

fix merge

parent 4e1e6583

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/app/app.module.ts 13 additions, 3 deletions

src/app/app.module.ts
src/app/home/home.component.ts 10 additions, 1 deletion

src/app/home/home.component.ts
src/app/structure-list/components/search/search.component.scss 3 additions, 1 deletion

...pp/structure-list/components/search/search.component.scss
src/app/structure-list/components/search/search.component.ts 1 addition, 1 deletion

src/app/structure-list/components/search/search.component.ts
src/app/structure-list/structure-list.component.scss 7 additions, 6 deletions

src/app/structure-list/structure-list.component.scss
src/app/structure-list/structure-list.scss 0 additions, 10 deletions

src/app/structure-list/structure-list.scss

with 34 additions and 22 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