Skip to content
Commit c494bbb8 authored by Robby Russell's avatar Robby Russell
Browse files

Resolving conflict in colorize patch #7742

parents 16ef5cca 67e0ef7a
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