From 4b4b1048436c745892226f5c52471e858377346d Mon Sep 17 00:00:00 2001
From: Marica <maricadsouza221197@gmail.com>
Date: Wed, 9 Mar 2022 17:29:38 +0530
Subject: [PATCH] fix: Merge conflicts

---
 erpnext/assets/doctype/asset/asset_dashboard.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/erpnext/assets/doctype/asset/asset_dashboard.py b/erpnext/assets/doctype/asset/asset_dashboard.py
index 461a67dbfc6..c81b611a418 100644
--- 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 {