projects / odoo / odoo.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eaa0310) | patch
Removed the conflict
authorJni (Open ERP) <jni@tinyerp.com>
Mon, 11 Oct 2010 10:38:56 +0000 (16:08 +0530)
committerJni (Open ERP) <jni@tinyerp.com>
Mon, 11 Oct 2010 10:38:56 +0000 (16:08 +0530)
commitebb0595c549b3e2472bf2242e217c98c091d0f1e
treef1651583d77c6a8ce4e5ba3565ab855739386bb7tree | snapshot
parenteaa031075c354bdef9ce568f6d8ca3b41047a3f3commit | diff
Removed the conflict

bzr revid: jni@tinyerp.com-20101011103856-dvfjcx75kpntp591
addons/stock/stock_view.xml diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.