From af19b81343bfbeea87bb6215a711577a71399cfe Mon Sep 17 00:00:00 2001
From: Diptanil Saha <diptanil@frappe.io>
Date: Wed, 12 Nov 2025 11:35:02 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/accounts/doctype/pos_profile/test_pos_profile.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
index 427748627ed..5efe3bd5380 100644
--- a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
@@ -4,11 +4,7 @@
 import unittest
 
 import frappe
-<<<<<<< HEAD
-=======
-from frappe.tests import IntegrationTestCase
 from frappe.utils import cint
->>>>>>> 69016a284f (test: added test to validate disabled pos profile)
 
 from erpnext.accounts.doctype.pos_profile.pos_profile import (
 	get_child_nodes,