| commit | ee4a2dd26f58771b5acb11bf96b34d4028267cc4 | [log] [tgz] |
|---|---|---|
| author | Saurabh <saurabh6790@gmail.com> | Tue Oct 03 18:02:09 2017 +0530 |
| committer | Saurabh <saurabh6790@gmail.com> | Tue Oct 03 18:02:09 2017 +0530 |
| tree | 388579ddd2515e1c90d11a68cf016771b91a871d | |
| parent | 7b6eaee05b36f58f3fccebac21dec7924e10b6d8 [diff] [blame] | |
| parent | f6580268e6ff5e40f7093ccc224d5e91c4ae6bad [diff] [blame] |
[fix] resolved merge conflicts
diff --git a/erpnext/patches.txt b/erpnext/patches.txt index e75c490..113c402 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt
@@ -448,3 +448,4 @@ erpnext.patches.v8_9.delete_gst_doctypes_for_outside_india_accounts erpnext.patches.v8_9.set_default_fields_in_variant_settings erpnext.patches.v8_9.update_billing_gstin_for_indian_account +erpnext.patches.v9_0.fix_subscription_next_date