From: mmcc <mmcc@openbsd.org>
Date: Thu, 22 Oct 2015 02:29:20 +0000 (+0000)
Subject: Fix typo in comment. From Theo Buehler.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f41c49da09e3fc4982ccaa5d9e2bbd58b0d93f03;p=openbsd

Fix typo in comment. From Theo Buehler.
---

diff --git a/bin/ksh/Makefile b/bin/ksh/Makefile
index a5a2fc2b825..b330267b628 100644
--- a/bin/ksh/Makefile
+++ b/bin/ksh/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2015/10/10 00:10:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.31 2015/10/22 02:29:20 mmcc Exp $
 
 PROG=	ksh
 SRCS=	alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c eval.c \
@@ -6,7 +6,7 @@ SRCS=	alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c eval.c \
 	misc.c path.c shf.c syn.c table.c trap.c tree.c tty.c var.c \
 	version.c vi.c
 
-# -DMKNOD - enable builtin mknod; conficts with pledge(2)
+# -DMKNOD - enable builtin mknod; conflicts with pledge(2)
 DEFS=	-Wall
 CFLAGS+=${DEFS} -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/gen
 MAN=	ksh.1 sh.1