solve merge conflict

This commit is contained in:
Ulf Gebhardt 2023-11-07 08:58:56 +01:00
parent f1e27b6094
commit f288fd6e00
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9

View File

@ -26,7 +26,7 @@ export default hopeTheme({
'/contact' '/contact'
] ]
}, },
{ /*{
text: 'Projects', text: 'Projects',
collapsible: false, collapsible: false,
children: [ children: [
@ -37,7 +37,7 @@ export default hopeTheme({
// { link: '/extras/contributing', text: 'Contributing ✨' }, // { link: '/extras/contributing', text: 'Contributing ✨' },
// { link: '/extras/license', text: 'License 📚' }, // { link: '/extras/license', text: 'License 📚' },
] ]
}, },*/
{ {
text: 'People', text: 'People',
collapsible: false, collapsible: false,