changelog
add conflict marker highlight
- Sun, 31 Dec 2017 14:42:54 -0500
- by Meredith Howard <mhoward@roomag.org> [Sun, 31 Dec 2017 14:42:54 -0500] rev 666
- add conflict marker highlight
housekeeping
- Sat, 30 Dec 2017 20:56:50 -0500
- by Meredith Howard <mhoward@roomag.org> [Sat, 30 Dec 2017 20:56:50 -0500] rev 665
- housekeeping
