5.0-alt7

- merge with desktop branch - unneded subpackages deleted

5.0-alt7
be3b2aee · Anton V. Boyarshinov · 931fb656 · be3b2aee
Commit be3b2aee authored Feb 18, 2009 by Anton V. Boyarshinov
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

branding.spec branding.spec +0 -1

No files found.
--- a/branding.spec
+++ b/branding.spec
@@ -214,7 +214,6 @@ echo lang | cpio -o --append -F message


 %changelog
-<<<<<<< HEAD:branding.spec
 * Tue Feb 17 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt7
 - merge with desktop branch
 - unneded subpackages deleted