fix mismerge

Change-Id: I6ece86dfdd99e30bc6aade1a769f8ff9290b4a72

fix mismerge
Change-Id: I6ece86dfdd99e30bc6aade1a769f8ff9290b4a72
b16cb229 · David Tardon · 674a7b44 · b16cb229
Kaydet (Commit) b16cb229 authored Nis 30, 2013 tarafından David Tardon
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

common_brand.scp scp2/source/ooo/common_brand.scp +0 -7

No files found.
--- 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;