Skip to content

B
branding-etersoft-ximper
Commit 15b2abe6 authored by Alexandra Panyukova's avatar Alexandra Panyukova
Browse files
Options

some merge errors fixed

parent 65409b8a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
branding.spec
View file @ 15b2abe6
...@@ -18,18 +18,10 @@ BuildRequires: libqt4-devel ...@@ -18,18 +18,10 @@ BuildRequires: libqt4-devel
BuildRequires: ImageMagick fontconfig bc libGConf-devel BuildRequires: ImageMagick fontconfig bc libGConf-devel
<<<<<<< HEAD
%define Theme Desktop
%define status beta
%define status_en beta
%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
=======
%define Theme Master %define Theme Master
%define status beta %define status beta
%define status_en beta %define status_en beta
%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench altlinux-desktop altlinux-gnome-desktop %define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench altlinux-desktop altlinux-gnome-desktop
>>>>>>> cas/school-master
Source: branding.tar Source: branding.tar
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment