[IMP]: resolved all conflicts
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 30 May 2012 13:30:24 +0000 (19:00 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Wed, 30 May 2012 13:30:24 +0000 (19:00 +0530)
commitbdeb623399719d751878ebf7392c3666664ed54d
tree46302b8262917f3dbf5de1dc7bc17afe3a6ba7ec
parentfd7e4e06ba7ea364768bae2d21fd7f186f79d2f1
parent06db0635ff6e59175b7bddcb764e013f2b755c18
[IMP]: resolved all conflicts

bzr revid: cha@tinyerp.com-20120530133024-ex0xf9142j8cn34o
addons/account/account_invoice_view.xml
addons/account_voucher/account_voucher_view.xml
addons/crm/crm_lead_view.xml
addons/event/event_view.xml
addons/hr_evaluation/hr_evaluation_view.xml
addons/hr_holidays/hr_holidays_view.xml
addons/project/project_view.xml
addons/stock/stock_view.xml