diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-11-15 13:52:31 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1995-11-15 13:52:31 +0000 |
| commit | 141bbdc7c69471df2ef9c8bf7a4a74e3c38955ed (patch) | |
| tree | d9789aadbd31fb290a77311b9bc2ae51b7cb30e5 /usr.bin/xargs | |
| parent | e3e60231443e77c8a5a48da4d81f73507352062e (diff) | |
zap some rcsmerge stuff
Diffstat (limited to 'usr.bin/xargs')
| -rw-r--r-- | usr.bin/xargs/pathnames.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h index fe034b610c9..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 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" |