From 2daa79fc0db98f10f7148fc89663f98234a66091 Mon Sep 17 00:00:00 2001
From: Michal Minar <miminar@redhat.com>
Date: Fri, 21 Jun 2013 12:49:13 +0200
Subject: [PATCH] fixed spec from uncomplete merge

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

diff --git a/wt.spec b/wt.spec
index cc08644..9c42c59 100644
--- a/wt.spec
+++ b/wt.spec
@@ -5,13 +5,8 @@
 %global WTRUNGROUP      apache
 
 Name:           wt
-<<<<<<< HEAD
-Version:        3.2.3
-Release:        2%{?dist}
-=======
 Version:        3.3.0
 Release:        1%{?dist}
->>>>>>> f18
 Summary:        C++ library for developing web applications
 
 Group:          Development/Libraries