Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=4e862d9c4f8d84e675b90c672239b07ba64198d3
commit 4e862d9c4f8d84e675b90c672239b07ba64198d3 Author: kikadf <[email protected]> Date: Thu Feb 26 13:24:30 2015 +0100 Fix conflict in clipgrab diff --git a/source/xmultimedia-extra/clipgrab/FrugalBuild b/source/xmultimedia-extra/clipgrab/FrugalBuild index 42cad75..d05c41f 100644 --- a/source/xmultimedia-extra/clipgrab/FrugalBuild +++ b/source/xmultimedia-extra/clipgrab/FrugalBuild @@ -5,11 +5,7 @@ options+=('asneeded') pkgname=clipgrab pkgver=3.4.9 -<<<<<<< HEAD pkgrel=2 -======= -pkgrel=1 ->>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b pkgdesc="ClipGrab is a free downloader and converter for YouTube, Vimeo, Dailymotion and many other online video sites." url="http://clipgrab.de/en"; _F_desktop_name="ClipGrab" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
