summaryrefslogtreecommitdiff
path: root/distrib/miniroot/install.sub
diff options
context:
space:
mode:
authorRobert Peichaer <rpe@cvs.openbsd.org>2014-06-09 18:05:56 +0000
committerRobert Peichaer <rpe@cvs.openbsd.org>2014-06-09 18:05:56 +0000
commit81e703dad283526a7724189efeeb101e44d8d99e (patch)
tree2195022cec39480aee6e2b00a22f1beb94aed2fe /distrib/miniroot/install.sub
parent2e5de425819ff4264d2e973b07fd9b5b4dc31180 (diff)
remove sysmerge leftovers
OK halex@ krw@
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r--distrib/miniroot/install.sub4
1 files changed, 1 insertions, 3 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 99aa670f55d..f60f48d75a6 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-# $OpenBSD: install.sub,v 1.774 2014/05/11 08:23:46 rpe Exp $
+# $OpenBSD: install.sub,v 1.775 2014/06/09 18:05:55 rpe Exp $
#
# Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback
# All rights reserved.
@@ -2011,8 +2011,6 @@ __EOT
ROOTDISK=
ROOTDEV=
PACKAGE_PATH=
-SM_ARGS=
-SM_ARGSX=
SETDIR="$VNAME/$ARCH"
CGI_INFO=/tmp/cgiinfo