From d09ed0a578a02e6808274f323b0b24786b0bda67 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Fri, 19 Nov 2021 13:11:07 +0530
Subject: [PATCH] fix: Conflicts

---
 .../regional/doctype/gstr_3b_report/test_gstr_3b_report.py    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
index 83bb02746cc..8ebefba3642 100644
--- a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
@@ -67,8 +67,6 @@ class TestGSTR3BReport(unittest.TestCase):
 		self.assertEqual(output["itc_elg"]["itc_avl"][4]["samt"], 22.50)
 		self.assertEqual(output["itc_elg"]["itc_avl"][4]["camt"], 22.50)
 
-<<<<<<< HEAD
-=======
 	def test_gst_rounding(self):
 		gst_settings = frappe.get_doc('GST Settings')
 		gst_settings.round_off_gst_values = 1
@@ -143,8 +141,6 @@ class TestGSTR3BReport(unittest.TestCase):
 		customer.load_from_db()
 		self.assertEqual(customer.gst_category, 'Registered Regular')
 
-
->>>>>>> cdbc991e3f (fix: Add test for gst category check)
 def make_sales_invoice():
 	si = create_sales_invoice(company="_Test Company GST",
 			customer = '_Test GST Customer',