Skip to content
Snippets Groups Projects
Commit 8b8d5b6f authored by Alice Poggioli's avatar Alice Poggioli
Browse files

resolve minor conflict.

parents b7767673 64e247e8
No related branches found
No related tags found
1 merge request!92Feature/breaking changes 0.9
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