Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=4265fe0a52d75080c9a9177ce2a87e3e2dca4226
commit 4265fe0a52d75080c9a9177ce2a87e3e2dca4226 Author: kikadf <[email protected]> Date: Thu Feb 26 13:06:41 2015 +0100 Fix conflict in alsa-plugins diff --git a/source/multimedia/alsa-plugins/FrugalBuild b/source/multimedia/alsa-plugins/FrugalBuild index d7e8487..64ad796 100644 --- a/source/multimedia/alsa-plugins/FrugalBuild +++ b/source/multimedia/alsa-plugins/FrugalBuild @@ -4,11 +4,7 @@ pkgname=alsa-plugins pkgver=1.0.27 -<<<<<<< HEAD pkgrel=7 -======= -pkgrel=5 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="Various plugins for ALSA." url="http://www.alsa-project.org"; depends=("alsa-lib>=1.0.26") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
