From a1bf2bb18c54bf8ea0c40a01275caa9f9f6df235 Mon Sep 17 00:00:00 2001 From: Attilio Rao Date: Tue, 31 May 2011 21:42:34 +0000 Subject: [PATCH] Revert mismerge --- tools/build/options/WITH_OFED | 2 +- tools/regression/bin/sh/builtins/set1.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/options/WITH_OFED b/tools/build/options/WITH_OFED index 6d9c0a1908d..a995fb8cdab 100644 --- a/tools/build/options/WITH_OFED +++ b/tools/build/options/WITH_OFED @@ -1,4 +1,4 @@ -.\" $FreeBSD: projects/largeSMP/tools/build/options/WITH_OFED 222016 2011-05-17 11:06:41Z ru $ +.\" $FreeBSD$ Set to build the .Dq "OpenFabrics Enterprise Distribution" Infiniband software stack. diff --git a/tools/regression/bin/sh/builtins/set1.0 b/tools/regression/bin/sh/builtins/set1.0 index 0043f45aedd..fc39fade627 100644 --- a/tools/regression/bin/sh/builtins/set1.0 +++ b/tools/regression/bin/sh/builtins/set1.0 @@ -1,4 +1,4 @@ -# $FreeBSD: projects/largeSMP/tools/regression/bin/sh/builtins/set1.0 222451 2011-05-29 15:02:10Z jilles $ +# $FreeBSD$ set +C set +f