[oe-commits] Haris Okanovic : start-stop-daemon: Fix RCONFLICTS typo

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: fido-next
Commit: 2ae3be14aed055ddfa2ddbace3771d094f13da4d
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=2ae3be14aed055ddfa2ddbace3771d094f13da4d

Author: Haris Okanovic <haris.okanovic at ni.com>
Date:   Fri May  8 14:14:46 2015 -0500

start-stop-daemon: Fix RCONFLICTS typo

Signed-off-by: Haris Okanovic <haris.okanovic at ni.com>
Reviewed-by: Ben Shelton <ben.shelton at ni.com>
Acked-by: Brad Mouring <brad.mouring at ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>

---

 meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
index c8d88b7..efdd6b7 100644
--- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
+++ b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.16.0.2.bb
@@ -4,7 +4,7 @@ LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://utils/start-stop-daemon.c;md5=a963623e4588f70122865aaa7a370ce4"
 # start-stop-daemon is usually shipped by dpkg
 DEPENDS = "ncurses"
-RCONFLICS_${PN} = "dpkg" 
+RCONFLICTS_${PN} = "dpkg"
 
 PNBLACKLIST[start-stop-daemon] ?= "BROKEN: fails because of gettext, partial fix is available here http://patchwork.openembedded.org/patch/89867/"