progrhyme/hugo-theme-bootie-docs

Resolving our conflicts

ethanmad opened this issue · 0 comments

ethanmad commented

Hi @progrhyme,
I pulled your recent changes (in the last ~1.5 years) into UM-Fencing/club-theme and found a lot of conflicts. Some are due to changes I've made that will work for your theme, too, so I'll list them here in case you'd like to merge them.

This is mostly to reduce the number of conflicts club-theme has with bootie-docs and make maintenance easier for me/my successor. Feel free to pick whichever commits you like; not all may apply here.

Thanks, as always, for your work and dedication!

Ethan