Resolve overlooked conflict

2012-05-02 19:40:55 +02:00 · 2012-05-02 19:40:55 +02:00 · c32dbac072
commit c32dbac072
parent e4e4f4d6d0
1 changed files with 0 additions and 5 deletions
--- a/beakerlib.spec
+++ b/beakerlib.spec
@ -1,12 +1,7 @@
 Name:       beakerlib
 Summary:    A shell-level integration testing library
-<<<<<<< HEAD
 Version:    1.5
 Release:    1%{?dist}
-=======
-Version:    1.4
-Release:    2%{?dist}
->>>>>>> f5ad9e3984cd736cf5d4a598351814d92919f59c
 License:    GPLv2
 Group:      Development/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root