Resolve merge conflicts (8cbd962f) · Commits · Marc Tröll / frag.jetzt SWTP 2022 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

frag.jetzt SWTP 2022
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

8cbd962f

Commit 8cbd962f authored 4 years ago by

André Holger Hanke

Downloads
- Plain Diff

Resolve merge conflicts

parents 1186bbd6 02458b2b

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/i18n/data-protection/data-protection-de.html 5 additions, 2 deletions

src/assets/i18n/data-protection/data-protection-de.html
src/assets/i18n/data-protection/data-protection-en.html 4 additions, 2 deletions

src/assets/i18n/data-protection/data-protection-en.html
src/assets/i18n/demo/demo-de.html 12 additions, 12 deletions

src/assets/i18n/demo/demo-de.html
src/assets/i18n/demo/demo-en.html 6 additions, 6 deletions

src/assets/i18n/demo/demo-en.html
src/assets/i18n/imprint/imprint-de.html 9 additions, 9 deletions

src/assets/i18n/imprint/imprint-de.html
src/assets/i18n/imprint/imprint-en.html 11 additions, 11 deletions

src/assets/i18n/imprint/imprint-en.html
src/styles.scss 26 additions, 0 deletions

src/styles.scss

with 73 additions and 42 deletions

0% 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