resolved merge conflicts

frappe/__init__.py

@@ -17,7 +17,7 @@ from faker import Faker
 from .exceptions import *
 from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
 
-__version__ = '10.1.35'
+__version__ = '10.1.36'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/email/smtp.py

@@ -54,7 +54,23 @@ def get_outgoing_email_account(raise_exception_not_set=True, append_to=None, sen
 
 		if append_to:
 			# append_to is only valid when enable_incoming is checked
-			email_account = _get_email_account({"enable_outgoing": 1, "enable_incoming": 1, "append_to": append_to})
+
+			# in case of multiple Email Accounts with same append_to
+			# narrow it down based on email_id
+			email_account = _get_email_account({
+				"enable_outgoing": 1,
+				"enable_incoming": 1,
+				"append_to": append_to,
+				"email_id": sender_email_id
+			})
+
+			# else find the first Email Account with append_to
+			if not email_account:
+				email_account = _get_email_account({
+					"enable_outgoing": 1,
+					"enable_incoming": 1,
+					"append_to": append_to
+				})
 
 		if not email_account and sender_email_id:
 			# check if the sender has email account with enable_outgoing

package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "babel-runtime": "^6.26.0",
     "chalk": "^2.3.2",
-    "less": "^3.0.1",
+    "less": "^3.0.4",
     "rollup": "^0.55.3",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-commonjs": "^8.3.0",