chore: fix conflicts

frappe · Dec 24, 2024 · 90aadcd · 90aadcd
1 parent 7a5c30f
commit 90aadcd
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py
@@ -3,12 +3,8 @@
 
 import frappe
 from frappe.query_builder.functions import CombineDatetime, Sum
-<<<<<<< HEAD
-from frappe.utils import flt
-from frappe.utils.deprecations import deprecated
-=======
 from frappe.utils import flt, nowtime
->>>>>>> 079b86044e (fix: posting_time issue (#44870))
+from frappe.utils.deprecations import deprecated
 from pypika import Order