Commit e645c93d authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Gerrit Code Review
Browse files

Merge changes Ia94fc7ac,Iffd25c5f 

* changes:
  Revert "Revert "Write conflict tables in image""
  Revert "Write conflict tables in image"
parents 85e47976 91288d8f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment