[merge] fix

erpnext/patches/v4_4/make_email_accounts.py

@@ -51,7 +51,6 @@ def execute():
 	# sales, jobs
 	for doctype in ("Sales Email Settings", "Jobs Email Settings"):
 		source = dict(frappe.db.sql("select field, value from tabSingles where doctype=%s", doctype))
-		print source
 		if source and  source.get('host'):
 			account = frappe.new_doc("Email Account")
 			mapping = {

erpnext/utilities/doctype/contact/contact.js

@@ -3,9 +3,7 @@
 
 {% include 'controllers/js/contact_address_common.js' %};
 
-<<<<<<< HEAD
 cur_frm.email_field = "email_id";
-=======
 frappe.ui.form.on("Contact", "validate", function(frm) {
 	// clear linked customer / supplier / sales partner on saving...
 	$.each(["Customer", "Supplier", "Sales Partner"], function(i, doctype) {
@@ -14,18 +12,3 @@ frappe.ui.form.on("Contact", "validate", function(frm) {
 			frappe.model.remove_from_locals(doctype, name);
 	});
 });
-
-cur_frm.cscript.refresh = function(doc) {
-	cur_frm.communication_view = new frappe.views.CommunicationList({
-		list: frappe.get_list("Communication", {"parent": doc.name, "parenttype": "Contact"}),
-		parent: cur_frm.fields_dict.communication_html.wrapper,
-		doc: doc,
-		recipients: doc.email_id
-	});
-}
-
->>>>>>> upstream/develop
-cur_frm.cscript.hide_dialog = function() {
-	if(cur_frm.contact_list)
-		cur_frm.contact_list.run();
-}

setup.py

@@ -1,10 +1,6 @@
 from setuptools import setup, find_packages
 
-<<<<<<< HEAD
 version = "5.0.0-alpha"
-=======
-version = "4.12.0"
->>>>>>> upstream/develop
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()