diff options
| author | Mustufa Rangwala <mra@mra-laptop> | 2010-06-24 10:05:29 +0530 |
|---|---|---|
| committer | Mustufa Rangwala <mra@mra-laptop> | 2010-06-24 10:05:29 +0530 |
| commit | e240abd8a53bbd976adca17d07d183807a770fc0 (patch) | |
| tree | 30fb5e2839f75dd5c085d7a4a46975a52abd5c4f /addons/document/document_view.xml | |
| parent | 09533ac1125fb4c518c540faa2155bc0aadd6c70 (diff) | |
Remove conflicts
bzr revid: mra@mra-laptop-20100624043529-ycm1nhj8x20un0jt
Diffstat (limited to 'addons/document/document_view.xml')
0 files changed, 0 insertions, 0 deletions