From eba51a64423b07a109b426c3a8557f9934656d0d Mon Sep 17 00:00:00 2001
From: Mario Blättermann <mario.blaettermann@gmail.com>
Date: Sep 29 2012 17:46:39 +0000
Subject: New upstream release


---

diff --git a/pogo.spec b/pogo.spec
index 065667f..ede8719 100644
--- a/pogo.spec
+++ b/pogo.spec
@@ -1,6 +1,11 @@
 Name:		pogo
+<<<<<<< HEAD
 Version:	0.8
 Release:	1%{?dist}
+=======
+Version:	0.7
+Release:	2%{?dist}
+>>>>>>> 95c69ad0d9a665be5e0591ac510cb06bf92bd9c3
 Summary:	Probably the simplest and fastest audio player for Linux
 Summary(de):	Möglicherweise der einfachste und schnellste Audioplayer für Linux
 
@@ -72,8 +77,14 @@ in Pogo abgespielten Alben bereit.
 %{_datadir}/%{name}/src/modules/Zeitgeist.*
 
 %changelog
+<<<<<<< HEAD
 * Fri Sep 28 2012 Mario Blättermann <mariobl@fedoraproject.org> - 0.8-1
 - New upstream version
+=======
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+>>>>>>> 95c69ad0d9a665be5e0591ac510cb06bf92bd9c3
 
 * Sun Apr 01 2012 Mario Blättermann <mariobl@fedoraproject.org> 0.7-1
 - New upstream version