diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-30 18:07:18 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-30 18:07:18 +0200 |
| commit | b16cb2291e6377de9beb7952c69251ff2a973ffa (patch) | |
| tree | df0ff9e53723409046d41dfe028707a9d2d30416 /scp2 | |
| parent | 674a7b44f3b9a90b0b6ed7fa8928ccd0efb597f8 (diff) | |
fix mismerge
Change-Id: I6ece86dfdd99e30bc6aade1a769f8ff9290b4a72
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 28c1dca8d4ad..7bf576cd019a 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; |