Skip to content
Snippets Groups Projects
Commit 6ebfd9cf authored by Dries Buytaert's avatar Dries Buytaert
Browse files

- Patch #1037352 by David_Rothstein: removed conflict.

parent df0e13bd
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