From 78635ebe992c21bdb2385c7067f7669b47adade6 Mon Sep 17 00:00:00 2001
From: Pandiyan P <pandiyanpalani37@gmail.com>
Date: Wed, 25 Mar 2026 13:24:07 +0530
Subject: [PATCH] fix(manufacturing): apply work order status filter in job
 card (#53776)

---
 erpnext/manufacturing/doctype/job_card/job_card.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index e60a0635042..d911456f602 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -31,8 +31,6 @@ frappe.ui.form.on("Job Card", {
 			};
 		});
 
-<<<<<<< HEAD
-=======
 		frm.set_query("operation", "time_logs", () => {
 			let operations = (frm.doc.sub_operations || []).map((d) => d.sub_operation);
 			return {
@@ -61,7 +59,6 @@ frappe.ui.form.on("Job Card", {
 			};
 		});
 
->>>>>>> d43d308e2f (fix(manufacturing): apply work order status filter in job card (#53766))
 		frm.set_indicator_formatter("sub_operation", function (doc) {
 			if (doc.status == "Pending") {
 				return "red";