Resolved potential conflict

dhee-tree · Dec 10, 2023 · 86c49c3 · 86c49c3
1 parent f1393c6
commit 86c49c3
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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;