rpms/beakerlib
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolve overlooked conflict

Browse Source
This commit is contained in:
Petr Muller 2012-05-02 19:40:55 +02:00
parent e4e4f4d6d0
commit c32dbac072
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
beakerlib.spec
View File

@ -1,12 +1,7 @@
Name: beakerlib Name: beakerlib
Summary: A shell-level integration testing library Summary: A shell-level integration testing library
<<<<<<< HEAD
Version: 1.5 Version: 1.5
Release: 1%{?dist} Release: 1%{?dist}
=======
Version: 1.4
Release: 2%{?dist}
>>>>>>> f5ad9e3984cd736cf5d4a598351814d92919f59c
License: GPLv2 License: GPLv2
Group: Development/Libraries Group: Development/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root