| commit | 30830e86e241e0acddaefb1578142b8279b0e2a7 | [log] [tgz] |
|---|---|---|
| author | Marshall Clow <mclow.lists@gmail.com> | Fri Dec 14 19:25:22 2018 +0000 |
| committer | Marshall Clow <mclow.lists@gmail.com> | Fri Dec 14 19:25:22 2018 +0000 |
| tree | 794aa78609aa628347cf452b3ac6f281910cea28 | |
| parent | 5f1a206ea678006996b80748397f50307b6ab4a1 [diff] |
When resolving a merge conflict, I put something inside an #ifdef. Fixed.