PERFORCE change 148136 for review

[Marius Strobl]

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

Change 148136 by marius at 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