| commit | aaec42ebc2754af99791798039e9b9f6ce48951a | [log] [tgz] |
|---|---|---|
| author | mbauskar <mbauskar@gmail.com> | Mon Aug 28 11:57:56 2017 +0530 |
| committer | mbauskar <mbauskar@gmail.com> | Mon Aug 28 11:57:56 2017 +0530 |
| tree | f4480d9daf8c30b4ead684efb6c6ca443f1ca6dc | |
| parent | 914b8463b7bcbba7322b00b22b3cd41ff21fbdba [diff] [blame] | |
| parent | 95e13ea62974f64287906c1287998a62ac415ce7 [diff] [blame] |
resolved merged conflicts
diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 8080bcd..7ec2753 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt
@@ -433,4 +433,5 @@ erpnext.patches.v8_6.set_write_permission_for_quotation_for_sales_manager erpnext.patches.v8_5.remove_project_type_property_setter erpnext.patches.v8_7.add_more_gst_fields +erpnext.patches.v8_7.fix_purchase_receipt_status erpnext.patches.v8_6.rename_bom_update_tool \ No newline at end of file