fix: resolved conflicts

frappe · Dec 31, 2024 · 00ae829 · 00ae829
1 parent 839ffb3
commit 00ae829
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
@@ -745,11 +745,8 @@ def process_fixed_asset(self):
 	def auto_make_assets(self, asset_items):
 		items_data = get_asset_item_details(asset_items)
 		messages = []
-<<<<<<< HEAD
-=======
 		alert = False
 		accounting_dimensions = get_dimensions(with_cost_center_and_project=True)
->>>>>>> 079ec864de (fix: copy accounting dimensions to asset and sales invoice (#44964))
 
 		for d in self.items:
 			if d.is_fixed_asset: