Skip to content
GitLab
Commit 986785c9 authored by isaacs's avatar isaacs
Browse files

Fix merge-conflicts in HTML 

Thanks, @AndreasMadsen
parent 11683556
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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