diff --git a/packages/backend/src/apps/gitea/index.js b/packages/backend/src/apps/gitea/index.js index 2e53a1c8..d4e0a20b 100644 --- a/packages/backend/src/apps/gitea/index.js +++ b/packages/backend/src/apps/gitea/index.js @@ -2,8 +2,11 @@ import defineApp from '../../helpers/define-app.js'; import addAuthHeader from './common/add-auth-header.js'; import auth from './auth/index.js'; import setBaseUrl from './common/set-base-url.js'; +<<<<<<< HEAD import triggers from './triggers/index.js'; import dynamicData from './dynamic-data/index.js'; +======= +>>>>>>> 589d3447 (feat(gitea): add gitea integration) export default defineApp({ name: 'Gitea', @@ -16,6 +19,9 @@ export default defineApp({ primaryColor: '609926', beforeRequest: [setBaseUrl, addAuthHeader], auth, +<<<<<<< HEAD triggers, dynamicData, +======= +>>>>>>> 589d3447 (feat(gitea): add gitea integration) }); diff --git a/packages/docs/pages/.vitepress/config.js b/packages/docs/pages/.vitepress/config.js index 713e5522..9bc40584 100644 --- a/packages/docs/pages/.vitepress/config.js +++ b/packages/docs/pages/.vitepress/config.js @@ -126,10 +126,14 @@ export default defineConfig({ text: 'Gitea', collapsible: true, collapsed: true, +<<<<<<< HEAD items: [ { text: 'Triggers', link: '/apps/gitea/triggers' }, { text: 'Connection', link: '/apps/gitea/connection' }, ], +======= + items: [{ text: 'Connection', link: '/apps/gitea/connection' }], +>>>>>>> 589d3447 (feat(gitea): add gitea integration) }, { text: 'GitHub',