From: deraadt <deraadt@openbsd.org>
Date: Wed, 15 Nov 1995 13:52:30 +0000 (+0000)
Subject: zap some rcsmerge stuff
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=00fb0514c8381207f9f9a26086e35cf4f37c5bce;p=openbsd

zap some rcsmerge stuff
---

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"