merge conflicts.
This commit is contained in:
parent
43b97d820e
commit
6d6247c2e2
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.1.1.1 1997/05/26 14:08:40 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.2 1997/05/26 14:17:15 mrg Exp $
|
||||
|
||||
PROG= rcmd
|
||||
SRCS= rsh.c
|
||||
|
@ -1,4 +1,4 @@
|
||||
.\" $NetBSD: rcmd.1,v 1.1.1.1 1997/05/26 14:08:41 mrg Exp $
|
||||
.\" $NetBSD: rcmd.1,v 1.2 1997/05/26 14:17:16 mrg Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1997 Matthew R. Green.
|
||||
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
|
||||
|
Loading…
Reference in New Issue
Block a user