-<<<<<<< HEAD
-commit 1ece6e6fd3faaae3f6c6d434497eb04235939dc3
-Author: Bdale Garbee <bdale@gag.com>
-Date: Mon Sep 18 20:43:14 2017 -0600
-
- be more aggressive about removing and ignoring .mdwn files
-
-commit b12e982259817328e348f1aaa91c5c824891e7b9
-Merge: b1cf0dab e87d56b6
-Author: Bdale Garbee <bdale@gag.com>
-Date: Mon Sep 18 20:35:00 2017 -0600
-
- Merge branch 'master' into branch-1.8
-
-=======
->>>>>>> branch-1.9