Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=2d3c6ec4159b9ff4de4a84e08cd7ba9e490c965a
commit 2d3c6ec4159b9ff4de4a84e08cd7ba9e490c965a Author: kikadf <[email protected]> Date: Thu Feb 26 13:25:32 2015 +0100 Fix conflict in kid3 diff --git a/source/kde-extra/kid3/FrugalBuild b/source/kde-extra/kid3/FrugalBuild index 49b602e..7d069e4 100644 --- a/source/kde-extra/kid3/FrugalBuild +++ b/source/kde-extra/kid3/FrugalBuild @@ -5,11 +5,7 @@ options+=('asneeded') pkgname=kid3 pkgver=3.1.2 -<<<<<<< HEAD pkgrel=3 -======= -pkgrel=2 ->>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE." Finclude kde sourceforge depends=('phonon' 'id3lib' 'libmp4v2>=2.0.0' 'taglib' 'attica>=0.4.0' "libnepomuk>=$_F_kde_ver" 'chromaprint>=0.7-2') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
