commit e7982f0f85e61cd4c064ceb9da827958d23c92e6
author Anand Doshi <anand@iwebnotes.com> Wed Dec 14 20:05:16 2011 +0530
committer Anand Doshi <anand@iwebnotes.com> Wed Dec 14 20:05:16 2011 +0530
tree 9965e78095bbabe841db51c03e48fdbbbec6f61c
parent ddf4c2655d9ec779a2c22603e465c17708b68fe8
parent 3fe9795020c42f5db2fa4937eed0b4d43b855d14

Merge branch 'master' of github.com:anandpdoshi/erpnext

Conflicts:
	erpnext/setup/doctype/email_digest/email_digest.py

erpnext/setup/doctype/email_digest/email_digest.py

diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 7ba3a90..5b76024 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -121,7 +121,7 @@
 				#webnotes.msgprint(query)
 				#webnotes.msgprint(res)
 				result[query] = (res and len(res)==1) and res[0] or (res and res or None)
-
+		
 		return result