From dabd5deb4e50189fba9ccc60a219a5c6a05c8db1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 3 Mar 2011 23:45:25 +0000
Subject: Fixup merge error and apply cleanups

(From OE-Core rev: a72822d315d7bc35a424b0807693ad7a3317c519)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'meta/recipes-graphics/x11vnc')

diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
index 129343be02..f5a6662660 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.12.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \
 DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz\
-           file://starting-fix.patch;patch=1"
+           file://starting-fix.patch"
 
 SRC_URI[md5sum] = "1498a68d02aa7b6c97bf746c073c8d00"
 SRC_URI[sha256sum] = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79"
-- 
cgit v1.2.3-54-g00ecf