From 36972b9b594deba6736e64eb217e0b60e6b8ef56 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Thu, 7 Apr 2016 22:41:54 +0530
Subject: [PATCH] [hot] [fix] email_alert.json

---
 frappe/email/doctype/email_alert/email_alert.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frappe/email/doctype/email_alert/email_alert.json b/frappe/email/doctype/email_alert/email_alert.json
index 3123f73464..52dd704df6 100644
--- a/frappe/email/doctype/email_alert/email_alert.json
+++ b/frappe/email/doctype/email_alert/email_alert.json
@@ -493,11 +493,7 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
-<<<<<<< HEAD
- "modified": "2016-04-03 06:04:54.541141",
-=======
- "modified": "2016-03-25 01:17:03.787967",
->>>>>>> master
+ "modified": "2016-04-03 06:04:54.541142",
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Email Alert",