Fixed merge conflict

This commit is contained in:
Nabin Hait
2019-04-15 11:41:54 +05:30
116 changed files with 9879 additions and 8255 deletions

View File

@@ -325,7 +325,7 @@ def get_data():
{
"type": "help",
"label": _("Sales Order to Payment"),
"youtube_id": "7AMq4lqkN4A"
"youtube_id": "1eP90MWoDQM"
},
{
"type": "help",