nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-04 00:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2017-02-08 11:33:33 +05:30
parent 70fd8546ce efd5eadfea
commit 6ff0caa87a
16 changed files with 296 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/config/learn.py
View File

@@ -44,7 +44,7 @@ def get_data():
},
{
"type": "help",
"label": _("Setting up Email"),
"label": _("Setting up Email Account"),
"youtube_id": "YFYe0DrB95o"
},
{
@@ -62,11 +62,6 @@ def get_data():
"label": _("Workflow"),
"youtube_id": "yObJUg9FxFs"
},
{
"type": "help",
"label": _("Email Account"),
"youtube_id": "YFYe0DrB95o"
},
{
"type": "help",
"label": _("File Manager"),