chore: resolve conflicts

Author: vorasmit

erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py

@@ -127,11 +127,7 @@ def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_
 				else:
 					entries[key] = row
 	out = list(entries.values())
-<<<<<<< HEAD:erpnext/accounts/report/tds_payable_monthly/tds_payable_monthly.py
-	out.sort(key=lambda x: (x["section_code"], x["transaction_date"]))
-=======
 	out.sort(key=lambda x: (x["tax_withholding_category"], x["transaction_date"], x["ref_no"]))
->>>>>>> 7630c01e40 (refactor: use consistent report column names):erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
 
 	return out