Skip to content
Snippets Groups Projects
Commit f8e99f82 authored by Syrine Neifar's avatar Syrine Neifar
Browse files

Solve the conflict situation

parents 52f4f555 67ac4ca7
No related branches found
No related tags found
1 merge request!80Resolve "Add Hedgedoc"
Pipeline #38274 passed with stages
in 3 minutes and 37 seconds