Commit fcb9913e authored by Cole Bemis's avatar Cole Bemis

Fix merge conflict

parents 615bdd05 809043c9
......@@ -3,4 +3,4 @@ If you'd like to request an icon, please provide the following information:
- at least one use case
- screenshots of similar icons
Please create one issue for each icon request.
\ No newline at end of file
Please create one issue for each icon request.
Markdown is supported
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