Cametendo/Todo-App-Backend
1
0
Fork 0
mirror of https://github.com/JGH0/Todo-App-Backend.git synced 2026-06-03 13:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Cametendo
2026-05-06 14:24:53 +02:00
parent af21317040
commit 3438888314
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/Routes.php
View File

@@ -6,9 +6,6 @@ use CodeIgniter\Router\RouteCollection;
* @var RouteCollection $routes * @var RouteCollection $routes
*/ */
$routes->get('/', 'Home::index'); $routes->get('/', 'Home::index');
<<<<<<< Updated upstream
=======
$routes->get('/themes', 'ThemeStore::index'); $routes->get('/themes', 'ThemeStore::index');
$routes->post('/themes/upload', 'ThemeStore::upload'); $routes->post('/themes/upload', 'ThemeStore::upload');
$routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1'); $routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1');
>>>>>>> Stashed changes