Rmove conflict indicators
This commit is contained in:
parent
e1e7a44e5f
commit
77ee6dea10
@ -34,12 +34,9 @@ Requires: %{name} = %{version}-%{release}
|
||||
A Qt-based GUI for the highlight source code formatter source.
|
||||
|
||||
%prep
|
||||
<<<<<<< highlight.spec
|
||||
|
||||
%setup -q -n %{name}-%{version}-beta
|
||||
%patch1 -p1 -b .org
|
||||
=======
|
||||
%setup -q
|
||||
>>>>>>> 1.54
|
||||
|
||||
# Provides: exclude perl(highlight_pipe) from example
|
||||
cat <<__EOF__ > %{name}-perl.prov
|
||||
|
Loading…
Reference in New Issue
Block a user