resolve merge conflict
Branches 5-histogram-for-numeric-questions
Showing
- .gitlab-ci.yml 61 additions, 20 deletions.gitlab-ci.yml
- angular.json 12 additions, 105 deletionsangular.json
- build.sh 8 additions, 0 deletionsbuild.sh
- docker-compose.yml 2 additions, 2 deletionsdocker-compose.yml
- package.json 3 additions, 2 deletionspackage.json
- src/app/footer/additional-data/additional-data.component.ts 4 additions, 2 deletionssrc/app/footer/additional-data/additional-data.component.ts
- src/app/footer/footer-bar/footer-bar.component.html 19 additions, 8 deletionssrc/app/footer/footer-bar/footer-bar.component.html
- src/app/footer/footer-bar/footer-bar.component.scss 9 additions, 3 deletionssrc/app/footer/footer-bar/footer-bar.component.scss
- src/app/footer/footer-bar/footer-bar.component.ts 2 additions, 3 deletionssrc/app/footer/footer-bar/footer-bar.component.ts
- src/app/header/header/header.component.html 13 additions, 11 deletionssrc/app/header/header/header.component.html
- src/app/header/header/header.component.scss 0 additions, 4 deletionssrc/app/header/header/header.component.scss
- src/app/header/header/header.component.ts 0 additions, 10 deletionssrc/app/header/header/header.component.ts
- src/app/i18n-manager/i18n-manager-overview/i18n-manager-overview.component.html 0 additions, 9 deletions...18n-manager-overview/i18n-manager-overview.component.html
- src/app/i18n-manager/i18n-manager-overview/i18n-manager-overview.component.ts 0 additions, 9 deletions.../i18n-manager-overview/i18n-manager-overview.component.ts
- src/app/lib/QuizValidator.ts 5 additions, 5 deletionssrc/app/lib/QuizValidator.ts
- src/app/lib/available-question-types.ts 4 additions, 4 deletionssrc/app/lib/available-question-types.ts
- src/app/lib/available-themes.ts 0 additions, 35 deletionssrc/app/lib/available-themes.ts
- src/app/lib/db/app.db.ts 19 additions, 0 deletionssrc/app/lib/db/app.db.ts
- src/app/lib/entities/QuizEntity.ts 2 additions, 0 deletionssrc/app/lib/entities/QuizEntity.ts
- src/app/lib/entities/question/ABCDSurveyQuestionEntity.ts 5 additions, 5 deletionssrc/app/lib/entities/question/ABCDSurveyQuestionEntity.ts
Please register or sign in to comment