From e96781579c4f4b6b218848b06f6ff8f142bc0b4c Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Sat, 24 Nov 2001 20:24:36 +0000
Subject: [PATCH] Whoops... left some junk in previous commit.

---
 release/picobsd/build/picobsd | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 0957285ea39..71b9a28f42c 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -1,10 +1,6 @@
 #!/bin/sh -
 #
-<<<<<<< picobsd
 # $FreeBSD$
-=======
-# $FreeBSD$
->>>>>>> 1.18
 #
 # The new PicoBSD build script. Invoked as
 #