rpms/highlight
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rmove conflict indicators

Browse Source
This commit is contained in:
Jochen Schmitt 2010-06-10 15:59:39 +00:00
parent e1e7a44e5f
commit 77ee6dea10
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
highlight.spec
View File

@ -34,12 +34,9 @@ Requires: %{name} = %{version}-%{release}
A Qt-based GUI for the highlight source code formatter source. A Qt-based GUI for the highlight source code formatter source.
%prep %prep
<<<<<<< highlight.spec
%setup -q -n %{name}-%{version}-beta %setup -q -n %{name}-%{version}-beta
%patch1 -p1 -b .org %patch1 -p1 -b .org
=======
%setup -q
>>>>>>> 1.54
# Provides: exclude perl(highlight_pipe) from example # Provides: exclude perl(highlight_pipe) from example
cat <<__EOF__ > %{name}-perl.prov cat <<__EOF__ > %{name}-perl.prov