From 86c49c3b26caa3fab370dec8f66a0fe5659f48ba Mon Sep 17 00:00:00 2001
From: Sgy157 <soggy706@googlemail.com>
Date: Sun, 10 Dec 2023 17:29:56 +0000
Subject: [PATCH] Resolved potential conflict

---
 WoodLess/routes/web.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WoodLess/routes/web.php b/WoodLess/routes/web.php
index 21454dcb..0b765877 100644
--- a/WoodLess/routes/web.php
+++ b/WoodLess/routes/web.php
@@ -1,10 +1,7 @@
 <?php
 
-<<<<<<< HEAD
 use Illuminate\Http\Request;
-=======
 use App\Http\Controllers\CategoryController;
->>>>>>> categories-page
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\BasketController;