From owner-freebsd-stable@FreeBSD.ORG  Fri Dec 23 21:22:24 2005
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
X-Original-To: freebsd-stable@freebsd.org
Delivered-To: freebsd-stable@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A54FE16A41F
	for <freebsd-stable@freebsd.org>; Fri, 23 Dec 2005 21:22:24 +0000 (GMT)
	(envelope-from freebsd.stable@melvyn.homeunix.org)
Received: from sarevok.lan.melvyn.homeunix.org (i153153.upc-i.chello.nl
	[62.195.153.153])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EC88743D46
	for <freebsd-stable@freebsd.org>; Fri, 23 Dec 2005 21:22:23 +0000 (GMT)
	(envelope-from freebsd.stable@melvyn.homeunix.org)
Received: by sarevok.lan.melvyn.homeunix.org (Postfix, from userid 100)
	id 85FB0114F6; Fri, 23 Dec 2005 22:22:22 +0100 (CET)
From: Melvyn Sopacua <freebsd.stable@melvyn.homeunix.org>
To: freebsd-stable@freebsd.org
Date: Fri, 23 Dec 2005 22:22:19 +0100
User-Agent: KMail/1.8.3
References: <20051223225430.7a78799a@localhost>
In-Reply-To: <20051223225430.7a78799a@localhost>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200512232222.20580.freebsd.stable@melvyn.homeunix.org>
Subject: Re: problems with groff in FreeBSD 6.0 buildworld
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, 
	<mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
	<mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Dec 2005 21:22:24 -0000

On Friday 23 December 2005 20:54, Telegin Gennady wrote:

> /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/
>src/preproc/grn/main.cpp:692: error: expected primary-expression before
> '<'token


> /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/
>src/preproc/grn/main.cpp:694: error: expected primary-expression before '>'
> token
> 

Can you paste line 690-700. This looks like a cvs merge conflict to me.
-- 
Melvyn Sopacua
freebsd.stable@melvyn.homeunix.org

FreeBSD 6.0-STABLE
Qt: 3.3.5
KDE: 3.4.3