diff options
Diffstat (limited to 'abs')
| -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 \ |