Fixed merge conflict
diff --git a/erpnext/accounts/doctype/subscription/subscription.js b/erpnext/accounts/doctype/subscription/subscription.js
index c9b3c64..9c5b264 100644
--- a/erpnext/accounts/doctype/subscription/subscription.js
+++ b/erpnext/accounts/doctype/subscription/subscription.js
@@ -3,15 +3,6 @@
frappe.ui.form.on('Subscription', {
setup: function(frm) {
- if(frm.doc.__islocal) {
- var last_route = frappe.route_history.slice(-2, -1)[0];
- if(frappe.dynamic_link && frappe.dynamic_link.doc
- && frappe.dynamic_link.doc.name==last_route[2]) {
- frm.set_value('reference_doctype', last_route[1]);
- frm.set_value('reference_document', last_route[2]);
- }
- }
-
frm.fields_dict['reference_document'].get_query = function() {
return {
filters: {
diff --git a/erpnext/change_log/v9/v9_0_0.md b/erpnext/change_log/v9/v9_0_0.md
new file mode 100644
index 0000000..fb6ae61
--- /dev/null
+++ b/erpnext/change_log/v9/v9_0_0.md
@@ -0,0 +1,8 @@
+#### POS
+- Now user has an option to enable or disable Offline POS mode from POS Settings
+- Provision to select the Item's serial number from the dropdown while adding item in the cart
+- Indicator for stock availability in Online POS Mode.
+
+#### Subscription
+- Setup recurring documents using **Subscription**
+- User can schedule the subscription for doctypes other than Sales Invoice, Purchase Invoice etc.
diff --git a/erpnext/modules.txt b/erpnext/modules.txt
index 04344a0..6449a4a 100644
--- a/erpnext/modules.txt
+++ b/erpnext/modules.txt
@@ -15,4 +15,4 @@
Maintenance
Schools
Regional
-Healthcare
\ No newline at end of file
+Healthcare