[IMP] remove confliction
authorHardik Ansodariy (OpenERP) <han@tinyerp.com>
Mon, 29 Aug 2011 05:47:15 +0000 (11:17 +0530)
committerHardik Ansodariy (OpenERP) <han@tinyerp.com>
Mon, 29 Aug 2011 05:47:15 +0000 (11:17 +0530)
commit8ae9536d75bfce5d9710a20a701d88024426b32e
treeaafb1df1baa25cc68e0322d61efd45cd096697c1
parent544bb8472561973166520f7eff93651d49a78d40
[IMP] remove confliction

bzr revid: han@tinyerp.com-20110829054715-pics8t7v7t9xyb01
addons/crm/crm_installer.py