Skip to content
Snippets Groups Projects
Verified Commit d575fc54 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

TEST: Testing special attributes merge conflict error msg.

parent 9191afa8
Branches
Tags
Pipeline #30775 passed
Stage: code_style
Stage: linting
Stage: test
Stage: deploy