[Libreoffice-commits] .: Branch 'integration/dev300_m101' - packimages/pack

[Michael Meeks]

 packimages/pack/image-sort.lst |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 65061190fc22bbc9b3d25a1f4324046e2ea53c0c
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Mar 15 12:43:00 2011 +0000

    more merge fixes

diff --git a/packimages/pack/image-sort.lst b/packimages/pack/image-sort.lst
index 5339b55..d7a615b 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