From d1fe164ea2882d8bffd4c98075b8c5e216ac07f9 Mon Sep 17 00:00:00 2001 From: Sasanka20 Date: Wed, 5 Aug 2026 12:21:01 +0530 Subject: [PATCH] fix: resolve import conflict in purchase order detail page --- .../app/dashboard/procurement/purchase-orders/[id]/page.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx index 10bc627..a51cde1 100644 --- a/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx +++ b/Frontend/erp-system/app/dashboard/procurement/purchase-orders/[id]/page.tsx @@ -3,12 +3,7 @@ import { useEffect, useState } from "react" import { useParams, useRouter } from "next/navigation" import Link from "next/link" -<<<<<<< HEAD -import { AlertTriangle, Ban, Plus, Save, Send, Trash2 } from "lucide-react" -======= import { AlertTriangle, ArrowLeft, Ban, Check, Plus, Save, Trash2 } from "lucide-react" ->>>>>>> 5d0ea3f (feat: enhance purchase orders management with delete and approve actions) - import { isPoEditable, purchaseOrdersApi } from "@/lib/api/purchase-orders" import { warehousesApi } from "@/lib/api/warehouses" import { itemsApi } from "@/lib/api/items"