From 00fb0514c8381207f9f9a26086e35cf4f37c5bce Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 15 Nov 1995 13:52:30 +0000 Subject: [PATCH] zap some rcsmerge stuff --- usr.bin/xargs/pathnames.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h index aefe6fe97da..402bb43078a 100644 --- a/usr.bin/xargs/pathnames.h +++ b/usr.bin/xargs/pathnames.h @@ -32,14 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * -<<<<<<< pathnames.h - * from: @(#)pathnames.h 5.1 (Berkeley) 4/17/90 - * $Id: pathnames.h,v 1.1.1.1 1995/10/18 08:47:00 deraadt Exp $ -||||||| 1.1.1.2 - * @(#)pathnames.h 5.1 (Berkeley) 4/17/90 -======= * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 ->>>>>>> /var/tmp/T4001951 */ #define _PATH_ECHO "/bin/echo" -- 2.20.1