fixes some merge conflicts (6b8923cf) · 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.

6b8923cf

Commit 6b8923cf authored 3 years ago by

Stefan Plociennik

Downloads
- Patches
- Plain Diff

fixes some merge conflicts

parent aa08488b

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html 10 additions, 11 deletions

...-administration/topic-cloud-administration.component.html
src/assets/i18n/creator/de.json 5 additions, 5 deletions

src/assets/i18n/creator/de.json
src/assets/i18n/creator/en.json 5 additions, 5 deletions

src/assets/i18n/creator/en.json

with 20 additions and 21 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