Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ecolyo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

6ff865fc

Commit 6ff865fc authored 4 years ago by HAUTBOIS Aurelie

Downloads
- Plain Diff

fix conflict

parents 7f22aba0 3873621c

No related branches found

No related tags found

1 merge request!247features/US375-change-report-models-enum-store

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/components/Options/OptionsView.tsx 2 additions, 2 deletions

src/components/Options/OptionsView.tsx
src/components/Options/ReportOptions.spec.tsx 22 additions, 23 deletions

src/components/Options/ReportOptions.spec.tsx
src/components/Options/ReportOptions.tsx 47 additions, 0 deletions

src/components/Options/ReportOptions.tsx
src/components/Options/__snapshots__/OptionsView.spec.tsx.snap 1 addition, 1 deletion

...omponents/Options/__snapshots__/OptionsView.spec.tsx.snap
src/components/Options/analysisOptions.scss 0 additions, 63 deletions

src/components/Options/analysisOptions.scss
src/components/Options/reportOptions.scss 67 additions, 0 deletions

src/components/Options/reportOptions.scss
src/locales/fr.json 3 additions, 5 deletions

src/locales/fr.json
src/services/mail.service.spec.ts 5 additions, 5 deletions

src/services/mail.service.spec.ts
src/services/mail.service.ts 9 additions, 6 deletions

src/services/mail.service.ts

with 156 additions and 105 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