From 3438888314f01f615ede824d58a61c4196f52054 Mon Sep 17 00:00:00 2001
From: Cametendo <cameronmathis08@gmail.com>
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 3d91166..32a3118 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -6,9 +6,6 @@ use CodeIgniter\Router\RouteCollection;
  * @var RouteCollection $routes
  */
 $routes->get('/', 'Home::index');
-<<<<<<< Updated upstream
-=======
 $routes->get('/themes', 'ThemeStore::index');
 $routes->post('/themes/upload', 'ThemeStore::upload');
 $routes->get('/themes/preview/(:segment)', 'ThemeStore::preview/$1');
->>>>>>> Stashed changes