[docs] [minor] merge conflict fixed

This commit is contained in:
Akhilesh Darjee
2013-10-15 11:25:57 +05:30
8 changed files with 70 additions and 14 deletions

View File

@@ -1,6 +1,6 @@
---
{
"_label": "Day-1: Setup Customer,Item, and Supplier"
"_label": "Day-1: Setup Customer, Item, and Supplier"
}
---
Login to your ERPNext account with the User ID and Password sent through the mail.