| commit | c0c2f75159ce5cc8bfa1bf99192c15dc9c50de82 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Wed Aug 31 12:36:03 2016 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Wed Aug 31 12:36:03 2016 +0530 |
| tree | 1d71512aca995c2c24682b65239c60c20bee5b38 | |
| parent | 566759acae05a7d96d49852767ddf6e033b9dd01 [diff] | |
| parent | 5380a1c56a1e1b086adb4adbfc96c4c8acb22d63 [diff] |
fixed conflict
diff --git a/erpnext/docs/user/manual/en/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md index 16c7acd..a42afb9 100644 --- a/erpnext/docs/user/manual/en/setting-up/price-lists.md +++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md
@@ -16,6 +16,4 @@ * Standard Buying and Selling Price List are created by default. -To disable specific Price List, uncheck Enabled field in it. Disabled Price List will not be available for selection in the Sales and Purchase transactions. - {next}