commit d78b8b53374e7d1f48ea9f7eb374f09e71e821e1
author Anand Doshi <anand@iwebnotes.com> Wed Aug 10 11:23:31 2011 +0530
committer Anand Doshi <anand@iwebnotes.com> Wed Aug 10 11:23:31 2011 +0530
tree cd2b415771884971766295e333f8db944bd92cdd
parent 8029ca24b55d0bce18527cbc176e75590a043f51
parent 6013016ab624b7b9959071e58725e5eaf2a0bec0

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

Conflicts:
	patches/patch.py

patches/patch.py

diff --git a/patches/patch.py b/patches/patch.py
index abd6ed6..76019c0 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1354,4 +1354,4 @@
 		reload_doc('knowledge_base', 'doctype', 'answer')
 	elif patch_no == 335:
 		for dt in ['Account', 'Cost Center', 'Territory', 'Item Group', 'Customer Group']:
-			sql("update `tabDocField` set fieldtype = 'Link', options = %s where fieldname = 'old_parent' and parent = %s", (dt, dt))
+			sql("update `tabDocField` set fieldtype = 'Link', options = %s where fieldname = 'old_parent' and parent = %s", (dt, dt))
\ No newline at end of file