diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | 0fe045d9566b66b766a8dd967e65ad6d57d78e5b (patch) | |
| tree | 7a7506427f1225f68a2179fa9e40f9e013549ea4 /sw/source/ui/web/web.src | |
| parent | 75999228ead62620ed8b9d3970277bf916af3d6d (diff) | |
| parent | 8409cfd0c4842fae1e087f8c932748f9305871a8 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sw/source/ui/web/web.src')
| -rw-r--r-- | sw/source/ui/web/web.src | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index fdfbe8b3c07a..1de9453e1fc7 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -79,4 +79,8 @@ String RID_WEBOLE_TOOLBOX { Text [ en-US ] = "Object/Web" ; }; +<<<<<<< local +======= +/************************************************************************* +>>>>>>> other |