scp2/source/ooo/common_brand.scp | 7 ------- 1 file changed, 7 deletions(-)
New commits: commit b16cb2291e6377de9beb7952c69251ff2a973ffa Author: David Tardon <dtar...@redhat.com> Date: Tue Apr 30 18:07:18 2013 +0200 fix mismerge Change-Id: I6ece86dfdd99e30bc6aade1a769f8ff9290b4a72 diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 28c1dca..7bf576c 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -628,13 +628,6 @@ File gid_Brand_File_Bmp_IntroAboutShell_custom End #endif -File gid_Brand_File_Images_Brand_Zip - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Share_Config; - Name = "images_brand.zip"; - Styles = (PACKED); -End - File gid_Brand_File_Txt_Package TXT_FILE_BODY; Dir = gid_Brand_Dir_Share_Extensions; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits