-
Yoshinori Okuji authored
Ignore conflicts in roles. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2398 20353a03-c40f-0410-a6d1-a30d3c3de9de
475056e3
Ignore conflicts in roles. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@2398 20353a03-c40f-0410-a6d1-a30d3c3de9de