diff options
| author | obo <obo@openoffice.org> | 2010-06-16 13:50:55 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-16 13:50:55 +0200 |
| commit | 847c992a251bcbbcaf71d3b1b366d70971b4ef03 (patch) | |
| tree | 3afe66167bc3425a9328a1390d33aeed22186725 /sd/source/ui/inc/assclass.hxx | |
| parent | 8b33a0235b99ef4e3a84458dfadb5bd08ac79308 (diff) | |
masterfix: #i10000# remove conflict marks
Diffstat (limited to 'sd/source/ui/inc/assclass.hxx')
0 files changed, 0 insertions, 0 deletions