Merge branch 'resolve-404-collision' into butter

This commit is contained in:
John Hess 2022-03-14 12:36:48 -05:00
commit 8348348300

View file

@ -1,5 +1,5 @@
--- ---
permalink: /404 permalink: /news
layout: default layout: default
--- ---