[FIX] Typo conflicts.
authorVaibhav (OpenERP) <vda@tinyerp.com>
Thu, 25 Aug 2011 10:06:09 +0000 (15:36 +0530)
committerVaibhav (OpenERP) <vda@tinyerp.com>
Thu, 25 Aug 2011 10:06:09 +0000 (15:36 +0530)
commit21495b24a25ca64b2691b0a2979a716375eb053a
treeeaf244d7b5e4409d7a3545e0c0f9c1f587135d97
parent6e3c8a495ccbaa3dd5dbd8cac0d0b9dd31cb4b13
[FIX] Typo conflicts.

bzr revid: vda@tinyerp.com-20110825100609-aw3dg3b5cmyyd48d
addons/base_diagram/controllers/main.py