summaryrefslogtreecommitdiffstats
path: root/release/picobsd
diff options
context:
space:
mode:
authorluigi <luigi@FreeBSD.org>2001-11-24 20:24:36 +0000
committerluigi <luigi@FreeBSD.org>2001-11-24 20:24:36 +0000
commitd49f2420be7972a13e3962999729833d7ca5322a (patch)
treedfbee74582fd21e0d2c55b59d0a5460c290e9153 /release/picobsd
parent120770784360a8f93846354ff663ace041a7ea23 (diff)
downloadFreeBSD-src-d49f2420be7972a13e3962999729833d7ca5322a.zip
FreeBSD-src-d49f2420be7972a13e3962999729833d7ca5322a.tar.gz
Whoops... left some junk in previous commit.
Diffstat (limited to 'release/picobsd')
-rwxr-xr-xrelease/picobsd/build/picobsd4
1 files changed, 0 insertions, 4 deletions
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 0957285..71b9a28 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
#
OpenPOWER on IntegriCloud