Skip to content
Snippets Groups Projects
Commit 67f90c79 authored by elliotec's avatar elliotec
Browse files

resolve changelog conflict

parent bc133c1e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
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