diff options
| author | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 13:29:07 +0200 |
|---|---|---|
| committer | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 13:29:07 +0200 |
| commit | 6c5d7c1a2c9932974f17fb36ed12f467590d220e (patch) | |
| tree | 25d7fbe3d660a33d84d776dcc0d9b02fb792b014 /sw/inc/doc.hxx | |
| parent | c991f55f85fc9b448d9741726bffbdebc4344605 (diff) | |
fix an erroneously committed merge conflict
Diffstat (limited to 'sw/inc/doc.hxx')
0 files changed, 0 insertions, 0 deletions