From f27498dc2602b008f6a42e5a80b3ca9c2f1aebb9 Mon Sep 17 00:00:00 2001 From: Cametendo Date: Wed, 6 May 2026 14:24:53 +0200 Subject: [PATCH] Fix merge conflict --- app/Config/Routes.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index e0043d4..4bd96a7 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -89,9 +89,6 @@ $routes->group('api/v1', ['namespace' => 'App\Controllers\Api\V1', 'filter' => [ $routes->put('user/themes/(:segment)', 'UserThemeController::update/$1'); $routes->delete('user/themes/(:segment)', 'UserThemeController::delete/$1'); }); -<<<<<<< Updated upstream -======= $routes->get('/themes', 'ThemeStore::index'); $routes->post('/themes/upload', 'ThemeStore::upload'); $routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1'); ->>>>>>> Stashed changes