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
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment