diff options
| author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-02-12 19:02:14 (GMT) |
|---|---|---|
| committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2009-02-12 19:02:14 (GMT) |
| commit | 90f01752a020a881a602acb10deec46eb00e0fa5 (patch) | |
| tree | db8268a6117846e402dcea56386c191a0f221004 /abs/core-testing | |
| parent | ee8437858ec0decf6ce36dfda90abde61f025016 (diff) | |
| download | linhes_pkgbuild-90f01752a020a881a602acb10deec46eb00e0fa5.zip linhes_pkgbuild-90f01752a020a881a602acb10deec46eb00e0fa5.tar.gz linhes_pkgbuild-90f01752a020a881a602acb10deec46eb00e0fa5.tar.bz2 | |
Cleanup from merge.
Diffstat (limited to 'abs/core-testing')
| -rw-r--r-- | abs/core-testing/fbsplash/PKGBUILD | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/abs/core-testing/fbsplash/PKGBUILD b/abs/core-testing/fbsplash/PKGBUILD index 08d04b2..f1a0e0e 100644 --- a/abs/core-testing/fbsplash/PKGBUILD +++ b/abs/core-testing/fbsplash/PKGBUILD @@ -9,11 +9,7 @@ url="http://fbsplash.berlios.de" license=('GPL') backup=('etc/conf.d/fbsplash.conf') makedepends=('klibc') -<<<<<<< HEAD:abs/core-testing/fbsplash/PKGBUILD depends=('initscripts' 'miscsplashutils' 'libjpeg' 'libpng' 'freetype2-static' 'gpm' 'libmng' 'which') -======= -depends=('initscripts' 'miscsplashutils' 'libjpeg' 'libpng' 'freetype2-static' 'gpm' 'libmng') ->>>>>>> origin/HEAD:abs/core-testing/fbsplash/PKGBUILD conflicts=('bootsplash' 'gensplash') install=fbsplash.install source=(http://download.berlios.de/fbsplash/splashutils-${pkgver}.tar.bz2 \ |