Resolve merge conflict
authorMichael McMahon <michael@fsf.org>
Mon, 14 Nov 2022 21:41:50 +0000 (16:41 -0500)
committerMichael McMahon <michael@fsf.org>
Mon, 14 Nov 2022 21:41:50 +0000 (16:41 -0500)
commitcfd3c144b1a3b01833e059e9f0a7280335964d92
treeb3909ca61bfa315b2b919df8b1dab9b8f6213d60
parent4454e20fca3892f81584e0e00cef17a11d0c346a
Resolve merge conflict
2022/includes/header.html
2022/includes/join-list.html
2022/includes/live_sidebar.html
2022/sponsors/index.html