chore: fixed merge conflicts

2024-06-26 09:34:09 +05:30
parent 5e91553190 326c77cdb9
commit f02b9c09e6
5 changed files with 37 additions and 30 deletions
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -40,15 +40,6 @@ Cypress.Commands.add("login", (email, password) => {
 	});
 });

-Cypress.Commands.add("get_logged_user", () => {
-	cy.request({
-		url: "/api/method/frappe.auth.get_logged_user",
-	}).then((resp) => {
-		alert(resp);
-		return resp.message;
-	});
-});
-
 Cypress.Commands.add("button", (text) => {
 	return cy.get(`button:contains("${text}")`);
 });