Resolve merge conflict in config.js

This commit is contained in:
elweyn 2023-11-30 10:48:11 +01:00
commit b015b6fb82
2 changed files with 3 additions and 19 deletions

View File

@ -19,6 +19,8 @@ jobs:
- name: Build Vuepress Pages
run: npm install && npm run build
env:
VUEPRESS_BASE: '/ocelot.social/'
- name: Deploy Vuepress to Github Pages
uses: crazy-max/ghaction-github-pages@v4

View File

@ -7,23 +7,5 @@ export default defineUserConfig({
...meta,
theme,
plugins,
base: '/ocelot.social/',
locales:{
// The key is the path for the locale to be nested under.
// As a special case, the default locale can use '/' as its path.
'/en/': {
lang: 'en-US', // this will be set as the lang attribute on <html>
title: 'Ocelot.Social',
// description: ''
},
'/': {
lang: 'de-DE',
title: 'Ocelot.Social',
// description: ''
},
'/fr/': {
lang: 'fr-FR',
title: 'Ocelot.Social',
}
}
base: process.env.VUEPRESS_BASE ?? '/',
})