From a5afec40f29081f5429394127dfc20d06306577a Mon Sep 17 00:00:00 2001
From: Salvatore Iovene <salvatore@iovene.com>
Date: Thu, 8 Aug 2013 13:39:52 +0300
Subject: [PATCH] Remove accidentally committed conflicts in spec file.

---
 packaging/cowhide.spec | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/packaging/cowhide.spec b/packaging/cowhide.spec
index dd48971..7371f74 100644
--- a/packaging/cowhide.spec
+++ b/packaging/cowhide.spec
@@ -1,9 +1,5 @@
 Name:       cowhide
-<<<<<<< HEAD
 Version:    0.1.4
-=======
-Version:    0.1.3
->>>>>>> 8a47931... Add initial Tizen packaging.
 Release:    0
 Summary:    UI Framework Library based on Twitter Bootstrap
 Group:      Development/Other
@@ -16,22 +12,11 @@ Source0:    %{name}-%{version}.tar.gz
 UI Framework Library based on Twitter Bootstrap
 
 %prep
-<<<<<<< HEAD
 tar xvfz %{_sourcedir}/%{name}-%{version}.tar.gz
 
 %install
 mkdir -p %{buildroot}/usr/share/cowhide
 cp -ar %{name}-%{version}/dist/* %{buildroot}/usr/share/cowhide/
-=======
-
-%build
-
-%install
-mkdir -p /usr/share/cowhide
-cp dist/* /usr/share/cowhide/
-
-%post
->>>>>>> 8a47931... Add initial Tizen packaging.
 
 %files
 /usr/share/cowhide/*
-- 
2.7.4