fixed conflict

selling/doctype/customer/customer.py

@@ -249,3 +249,13 @@ class DocType(TransactionBase):
 		#update master_name in doctype account
 		webnotes.conn.sql("""update `tabAccount` set master_name = %s, 
 			master_type = 'Customer' where master_name = %s""", (new,old))
+
+test_records = [
+	[{
+		"doctype": "Customer",
+		"customer_type": "Individual",
+		"customer_group": "_Test Customer Group",
+		"territory": "_Test Territory",
+		"company": "_Test Company"
+	}]
+]