summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/vlc/PKGBUILD1
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 5b5fab6f9..f23c9fd41 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -28,7 +28,6 @@ optdepends=('avahi: for service discovery using bonjour protocol'
[ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: for lirc plugin')
optdepends+=('libavc1394: for devices using the 1394ta AV/C'
'libdc1394: for IEEE 1394 plugin'
-<<<<<<< HEAD
'kdelibs: KDE Solid hardware integration')
[ "$CARCH" = "mips64el" ] || optdepends+=('libva-vdpau-driver: vdpau back-end for nvidia'
'libva-driver-intel: back-end for intel cards')