diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:43:00 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:43:00 +0000 |
| commit | 71b27e6206d621a8601bceb338f008c34d6390b5 (patch) | |
| tree | a1e8860203775e5d2a10b55c69d71ea067166691 /packimages | |
| parent | 8aaf3bfa012144e45a9498347036a96dcd4d008c (diff) | |
more merge fixes
Diffstat (limited to 'packimages')
| -rw-r--r-- | packimages/pack/image-sort.lst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst index 5339b554d5e8..d7a615be3bda 100644 --- a/packimages/pack/image-sort.lst +++ b/packimages/pack/image-sort.lst @@ -309,7 +309,6 @@ uiconfig/modules/swriter/toolbar/graphicobjectbar.xml uiconfig/modules/swriter/toolbar/insertbar.xml uiconfig/modules/swriter/toolbar/mediaobjectbar.xml uiconfig/modules/swriter/toolbar/moreformcontrols.xml -uiconfig/modules/swriter/toolbar/navigationobjectbar.xml uiconfig/modules/swriter/toolbar/numobjectbar.xml uiconfig/modules/swriter/toolbar/oleobjectbar.xml uiconfig/modules/swriter/toolbar/optimizetablebar.xml |