From 2f7eaf88a27d8b1c796ce578794ae49f93b47c0551b42c452ea01c2a6782c305 Mon Sep 17 00:00:00 2001
From: Abhishek Mali <maliabhi000@gmail.com>
Date: Fri, 14 Nov 2025 14:06:23 +0530
Subject: [PATCH] web.php

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

diff --git a/routes/web.php b/routes/web.php
index 565bf32..e994ed4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -78,9 +78,6 @@ Route::prefix('admin')->middleware('auth:admin')->group(function () {
     Route::post('/orders/temp/reset', [AdminOrderController::class, 'resetTemp'])
      ->name('admin.orders.temp.reset');
 
-
-
-<<<<<<< HEAD
     Route::get('/shipments', [ShipmentController::class, 'index'])
         ->name('admin.shipments');
 
@@ -92,7 +89,5 @@ Route::prefix('admin')->middleware('auth:admin')->group(function () {
 
     Route::get('/shipments/{id}', [ShipmentController::class, 'show'])
         ->name('admin.shipments.show');
-=======
->>>>>>> 2c5d19779b747ce1d7f0bc8978d8c417b374849f3b9023bf30ac502d14d9650d
 
 });