tree 05b808eed0e3aa78ddda72a6056da9b2802bbd9f
parent 59d8a76e607ee2a4f2106ae9228ae9657ccb9862
author Anand Doshi <anand@erpnext.com> 1361425236 +0530
committer Anand Doshi <anand@erpnext.com> 1361425236 +0530

changed modified of global defaults.txt after merge conflict