chore: resolve conflicts

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
frappe · Aug 14, 2024 · 036a7ab · 036a7ab
1 parent 7ff7ad3
commit 036a7ab
Showing 1 changed file with 2 additions and 84 deletions.
diff --git a/frappe/email/doctype/email_account/email_account.json b/frappe/email/doctype/email_account/email_account.json
@@ -89,10 +89,7 @@
   },
   {
    "default": "0",
-<<<<<<< HEAD
-=======
-   "depends_on": "eval: doc.service != \"Frappe Mail\" && !doc.backend_app_flow",
->>>>>>> dde466be3d (feat: Implement OAuth Backend App Flow for Email Accounts (#27167))
+   "depends_on": "eval: !doc.backend_app_flow",
    "fieldname": "login_id_is_different",
    "fieldtype": "Check",
    "hide_days": 1,
@@ -581,11 +578,7 @@
    "label": "IMAP Details"
   },
   {
-<<<<<<< HEAD
-   "depends_on": "eval: doc.auth_method === \"OAuth\" && !doc.__islocal && !doc.__unsaved",
-=======
-   "depends_on": "eval: doc.auth_method === \"OAuth\" && doc.connected_app && doc.connected_user && !doc.backend_app_flow",
->>>>>>> dde466be3d (feat: Implement OAuth Backend App Flow for Email Accounts (#27167))
+   "depends_on": "eval: doc.auth_method === \"OAuth\" && !doc.__islocal && !doc.__unsaved && !doc.backend_app_flow",
    "fieldname": "authorize_api_access",
    "fieldtype": "Button",
    "label": "Authorize API Access"
@@ -620,94 +613,19 @@
    "label": "Connected User",
    "mandatory_depends_on": "eval: doc.auth_method === \"OAuth\" && !doc.backend_app_flow",
    "options": "User"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "default": "1",
-   "depends_on": "use_ssl",
-   "fetch_from": "domain.use_ssl",
-   "fieldname": "validate_ssl_certificate",
-   "fieldtype": "Check",
-   "hide_days": 1,
-   "hide_seconds": 1,
-   "label": "Validate SSL Certificate"
-  },
-  {
-   "depends_on": "enable_incoming",
-   "fieldname": "incoming_popimap_tab",
-   "fieldtype": "Tab Break",
-   "label": "Incoming"
-  },
-  {
-   "default": "https://frappemail.com",
-   "depends_on": "eval: doc.service == \"Frappe Mail\"",
-   "fieldname": "frappe_mail_site",
-   "fieldtype": "Data",
-   "label": "Frappe Mail Site",
-   "mandatory_depends_on": "eval: doc.service == \"Frappe Mail\""
-  },
-  {
-   "depends_on": "enable_outgoing",
-   "fieldname": "outgoing_tab",
-   "fieldtype": "Tab Break",
-   "label": "Outgoing"
-  },
-  {
-   "fieldname": "column_break_h5pd",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_uc6h",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_uynb",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval: doc.service == \"Frappe Mail\"",
-   "fieldname": "last_synced_at",
-   "fieldtype": "Datetime",
-   "label": "Last Synced At"
-  },
-  {
-   "depends_on": "eval: (doc.service == \"Frappe Mail\" && doc.auth_method != \"Basic\" && !doc.__islocal && !doc.__unsaved)",
-   "fieldname": "validate_frappe_mail_settings",
-   "fieldtype": "Button",
-   "label": "Validate Frappe Mail Settings"
-  },
-  {
-   "depends_on": "eval: doc.service == \"Frappe Mail\" && doc.auth_method == \"Basic\"",
-   "fieldname": "api_key",
-   "fieldtype": "Data",
-   "label": "API Key",
-   "mandatory_depends_on": "eval: doc.service == \"Frappe Mail\" && doc.auth_method == \"Basic\""
-  },
-  {
-   "depends_on": "eval: doc.service == \"Frappe Mail\" && doc.auth_method == \"Basic\"",
-   "fieldname": "api_secret",
-   "fieldtype": "Password",
-   "label": "API Secret",
-   "mandatory_depends_on": "eval: doc.service == \"Frappe Mail\" && doc.auth_method == \"Basic\""
   },
   {
    "default": "0",
    "depends_on": "eval: doc.auth_method === \"OAuth\"",
    "fieldname": "backend_app_flow",
    "fieldtype": "Check",
    "label": "Authenticate as Service Principal"
->>>>>>> dde466be3d (feat: Implement OAuth Backend App Flow for Email Accounts (#27167))
   }
  ],
  "icon": "fa fa-inbox",
  "index_web_pages_for_search": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-05 15:03:08.538819",
-=======
  "modified": "2024-07-18 11:05:57.193762",
->>>>>>> dde466be3d (feat: Implement OAuth Backend App Flow for Email Accounts (#27167))
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Email Account",