Skip to content
Snippets Groups Projects
Commit 18a497e1 authored by Diana Huang's avatar Diana Huang
Browse files

Fix merge conflict in sass

parent 03a4af7a
No related branches found
No related tags found
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