From owner-p4-projects@FreeBSD.ORG  Fri Aug 22 21:04:08 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D3B561065676; Fri, 22 Aug 2008 21:04:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9752A1065688
	for <perforce@freebsd.org>; Fri, 22 Aug 2008 21:04:07 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8715B8FC15
	for <perforce@freebsd.org>; Fri, 22 Aug 2008 21:04:07 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ML4772057763
	for <perforce@freebsd.org>; Fri, 22 Aug 2008 21:04:07 GMT
	(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ML47sp057761
	for perforce@freebsd.org; Fri, 22 Aug 2008 21:04:07 GMT
	(envelope-from marius@freebsd.org)
Date: Fri, 22 Aug 2008 21:04:07 GMT
Message-Id: <200808222104.m7ML47sp057761@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marius@freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148136 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Aug 2008 21:04:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=148136

Change 148136 by marius@flak on 2008/08/22 21:03:29

	Fix a merge botch.

Affected files ...

.. //depot/projects/usiii/conf/files.sparc64#7 edit
.. //depot/projects/usiii/conf/options.sparc64#4 edit

Differences ...

==== //depot/projects/usiii/conf/files.sparc64#7 (text+ko) ====


==== //depot/projects/usiii/conf/options.sparc64#4 (text+ko) ====

@@ -1,15 +1,5 @@
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/conf/options.sparc64#14
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.14 2006/11/02 00:01:15 marius Exp $
-
-SUN4U			opt_global.h
-
-==== THEIRS //depot/vendor/freebsd/src/sys/conf/options.sparc64#15
 # $FreeBSD: src/sys/conf/options.sparc64,v 1.15 2008/08/22 20:28:19 marius Exp $
 
-==== YOURS //flak/projects/usiii/conf/options.sparc64
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.14 2006/11/02 00:01:15 marius Exp $
-
-<<<<
 GFB_DEBUG		opt_gfb.h
 GFB_NO_FONT_LOADING	opt_gfb.h
 GFB_NO_MODE_CHANGE	opt_gfb.h