Commit d6a6f004 authored by Leigh B Stoller's avatar Leigh B Stoller

Revert "Fix conflict", cause I never get conflicts right.

This reverts commit a087c9e3.
parent a087c9e3
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