vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[hot] [fix] email_alert.json

Browse source
This commit is contained in:
Anand Doshi 2016-04-07 22:41:54 +05:30
parent 7132935fef
commit 36972b9b59
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/email/doctype/email_alert/email_alert.json
View file

@ -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",