[pogo] Spec file cleanup
Mario Blättermann
mariobl at fedoraproject.org
Sat Sep 29 17:49:59 UTC 2012
commit a08c8215439adfc440970ebf812d5b686add0877
Author: Mario Blättermann <mario.blaettermann at gmail.com>
Date: Sat Sep 29 19:50:40 2012 +0200
Spec file cleanup
pogo.spec | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/pogo.spec b/pogo.spec
index ede8719..065667f 100644
--- a/pogo.spec
+++ b/pogo.spec
@@ -1,11 +1,6 @@
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
@@ -77,14 +72,8 @@ in Pogo abgespielten Alben bereit.
%{_datadir}/%{name}/src/modules/Zeitgeist.*
%changelog
-<<<<<<< HEAD
* Fri Sep 28 2012 Mario Blättermann <mariobl at fedoraproject.org> - 0.8-1
- New upstream version
-=======
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at 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 at fedoraproject.org> 0.7-1
- New upstream version
More information about the scm-commits
mailing list