From c32dbac072265f232ef541180ad88f15c2cb3540 Mon Sep 17 00:00:00 2001
From: Petr Muller <muller@redhat.com>
Date: Wed, 2 May 2012 19:40:55 +0200
Subject: [PATCH] Resolve overlooked conflict

---
 beakerlib.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/beakerlib.spec b/beakerlib.spec
index 95cd6c9..a4c1637 100644
--- 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