- cleanup

41c1599d · Sergey V Turchin · f61fa4ef · 41c1599d
Commit 41c1599d authored Feb 07, 2011 by Sergey V Turchin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

branding.spec branding.spec +0 -6

No files found.
--- a/branding.spec
+++ b/branding.spec
@@ -5,15 +5,9 @@
 %define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop


-<<<<<<< HEAD
 Name: branding-%brand-kdesktop
 Version: 6.0.0
 Release: alt6
-=======
-Name: branding-%brand-%theme
-Version: 6.0.0 
-Release: alt2
->>>>>>> boyarsh/centaurus
 BuildArch: noarch

 %define theme %name