Skip to content
Snippets Groups Projects
Commit 89a261ac authored by sergio's avatar sergio
Browse files

resolve merge conflict in header file descriptions

parents b4a2f37f 413f3fd9
No related merge requests found
Showing
with 22 additions and 19 deletions
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