From ec9dadf700e8d9b1393e592f2b0c2c536194f264 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 24 Feb 2021 17:21:52 +0530
Subject: [PATCH] fix: Resolve merge error

---
 frappe/core/doctype/scheduled_job_type/scheduled_job_type.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
index 2c86b6efd7..fe39f51ce9 100644
--- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
+++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
@@ -116,8 +116,8 @@ class ScheduledJobType(Document):
 def execute_event(doc: str):
 	frappe.only_for("System Manager")
 	doc = json.loads(doc)
-  frappe.get_doc("Scheduled Job Type", doc.get("name")).enqueue(force=True)
-  return doc
+	frappe.get_doc("Scheduled Job Type", doc.get("name")).enqueue(force=True)
+	return doc
 
 
 def run_scheduled_job(job_type: str):