fixed conflicts

erpnext/accounts/doctype/coupon_code/coupon_code.json

@@ -12,7 +12,6 @@
   "customer",
   "column_break_4",
   "coupon_code",
-  "price_list",
   "pricing_rule",
   "uses",
   "valid_from",
@@ -59,12 +58,6 @@
    "set_only_once": 1,
    "unique": 1
   },
-  {
-   "fieldname": "price_list",
-   "fieldtype": "Link",
-   "label": "Price List",
-   "options": "Price List"
-  },
   {
    "fieldname": "pricing_rule",
    "fieldtype": "Link",
@@ -120,7 +113,7 @@
    "read_only": 1
   }
  ],
- "modified": "2019-05-28 21:06:29.395619",
+ "modified": "2019-10-15 14:12:22.686986",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Coupon Code",

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -88,7 +88,6 @@ def test_create_test_data():
 		"doctype": "Coupon Code",
 		"coupon_name":"SAVE30",
 		"coupon_code":"SAVE30",
-		"price_list": "_Test Price List",
 		"pricing_rule": "_Test Pricing Rule for _Test Item",
 		"valid_from": "2014-01-01",
 		"maximum_use":1,

erpnext/selling/doctype/quotation/quotation.json

@@ -3331,7 +3331,7 @@
    "istable": 0,
    "max_attachments": 1,
    "menu_index": 0,
-   "modified": "2019-06-26 01:00:21.545591",
+   "modified": "2019-10-14 01:00:21.545591",
    "modified_by": "Administrator",
    "module": "Selling",
    "name": "Quotation",

erpnext/setup/doctype/sales_partner/sales_partner.json

@@ -846,7 +846,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2019-03-21 16:26:45.447265", 
+ "modified": "2019-10-14 16:26:45.447265", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Sales Partner", 

erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json

@@ -713,7 +713,7 @@
    "issingle": 1,
    "istable": 0,
    "max_attachments": 0,
-   "modified": "2019-01-26 13:54:24.575322",
+   "modified": "2019-10-14 13:54:24.575322",
    "modified_by": "Administrator",
    "module": "Shopping Cart",
    "name": "Shopping Cart Settings",