fix: Merge conflicts

2026-04-29 19:48:27 +00:00 · 2022-03-09 17:29:38 +05:30
parent f721a2929f
commit 4b4b104843
1 changed files with 1 additions and 4 deletions
--- a/erpnext/assets/doctype/asset/asset_dashboard.py
+++ b/erpnext/assets/doctype/asset/asset_dashboard.py
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-
-=======
 from frappe import _
->>>>>>> 16de29a3cb (fix(translation) - correction for translation)
+

 def get_data():
 	return {