nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge conflicts

Browse Source
This commit is contained in:
Marica
2022-03-09 17:29:38 +05:30
committed by GitHub
parent f721a2929f
commit 4b4b104843
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/assets/doctype/asset/asset_dashboard.py
View File

@@ -1,8 +1,5 @@
<<<<<<< HEAD
=======
from frappe import _ from frappe import _
>>>>>>> 16de29a3cb (fix(translation) - correction for translation)
def get_data(): def get_data():
return { return {