Fix merge issues (2a0859f0) · Commits · IQB / verona-modules-aspect · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

verona-modules-aspect
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2a0859f0

Commit 2a0859f0 authored 1 year ago by rhenck

Downloads
- Patches
- Plain Diff

Fix merge issues

parent 53f887fa

No related branches found

No related tags found

No related merge requests found

Pipeline #48617 failed 1 year ago

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

projects/common/models/elements/element.ts 1 addition, 1 deletion

projects/common/models/elements/element.ts
projects/common/models/section.ts 8 additions, 6 deletions

projects/common/models/section.ts
projects/common/models/unit.ts 2 additions, 1 deletion

projects/common/models/unit.ts
projects/common/services/sanitization.service.ts 18 additions, 20 deletions

projects/common/services/sanitization.service.ts
projects/editor/src/app/services/default-property-generators/unit-properties.ts 6 additions, 2 deletions

...p/services/default-property-generators/unit-properties.ts
projects/editor/src/app/services/unit.service.ts 2 additions, 0 deletions

projects/editor/src/app/services/unit.service.ts

with 37 additions and 30 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

Impressum | Datenschutzerklärung