resolve merge conflict
authorGreg Farough <gregf@gnu.org>
Wed, 30 Nov 2022 21:41:28 +0000 (16:41 -0500)
committerGreg Farough <gregf@gnu.org>
Wed, 30 Nov 2022 21:41:28 +0000 (16:41 -0500)
commitc0f734926610803bac87dfbd1882818ffc7fa37f
treed8c6921bbdd6908ecb33a84205970f1993dd005d
parente9bd19be24c8992f6ff101d263fbd7e8a9460039
parent49363114bcf379f9d4351c6c699ba6e4fe1a2eae
resolve merge conflict
2023/includes/recent-updates.html