Commit 65b42a1e authored by Benjamin Peterson's avatar Benjamin Peterson

revert merge properties to something sane

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