chore: resolve merge conflicts · eb43e2f49f - frontend - jCloud Gitea

Seekra/frontend

generated from Seekra/repository-template

chore: resolve merge conflicts

This commit is contained in:

jakob.scheid

2026-07-28 20:10:40 +02:00

parent 79267d0059

commit eb43e2f49f

1 changed files with 1 additions and 1 deletions

									
										src/router/index.js
									
		+1
		-1
	
												View File
												
					@@ -40,7 +40,7 @@ const routes = [

					        }

					        }

					    },

					    },

					    {

					    {

					        path: '/settings/:rest(.*)*',

					        path: '/settings',

					        name: 'settings',

					        name: 'settings',

					        component: SettingsView,

					        component: SettingsView,

					        meta: {

					        meta: {