From 90f01752a020a881a602acb10deec46eb00e0fa5 Mon Sep 17 00:00:00 2001
From: Cecil Hugh Watson <knoppmyth@gmail.com>
Date: Thu, 12 Feb 2009 11:02:14 -0800
Subject: Cleanup from merge.

---
 abs/core-testing/fbsplash/PKGBUILD | 4 ----
 1 file changed, 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 \
-- 
cgit v0.12

