[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.

View File

@@ -136,4 +136,4 @@ Payments made against Sales Invoices or Purchase Invoices can be made by clickin
![Payment Entry](img/thirddaysetup-payment-entry.png)
<br>
> To understand Payment Entry in detail, visit [Payment Entry](docs.user.accounts.payments.html).
> To understand Payment Entry in detail, visit [Payment Entry](docs.user.accounts.payments.html).

View File

@@ -83,4 +83,4 @@ To go to a Journal Voucher, click on Accounts. On the Accounts page, click on Jo
Some of the major Accounting Reports are General Ledger, Trial Balance, Accounts Payable and Accounts Receivables, and Sales and Purchase Register.
> To be able to generate these accounts, visti [Accounting Reports](docs.user.accounts.report.html)
> To be able to generate these accounts, visti [Accounting Reports](docs.user.accounts.report.html)

View File

@@ -29,4 +29,4 @@ To create a Task, go to Project and click on Task.
<br>
#### Website
> To understand Website in detail, visit [Website](docs.user.website.html)
> To understand Website in detail, visit [Website](docs.user.website.html)