From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lee Revell <rlrevell@joe-job.com>
Subject: Re: Re: Disagreement about versions following CVS
	update
Date: Sat, 20 Aug 2005 17:06:23 -0400
Message-ID: <1124571984.2115.5.camel@mindpipe>
References: <43063408.60402@redfish-solutions.com>
	 <4306D911.70101@netvigator.com>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-admin@lists.sourceforge.net>
In-Reply-To: <4306D911.70101@netvigator.com>
Sender: alsa-devel-admin@lists.sourceforge.net
Errors-To: alsa-devel-admin@lists.sourceforge.net
List-Unsubscribe: <https://lists.sourceforge.net/lists/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Post: <mailto:alsa-devel@lists.sourceforge.net>
List-Help: <mailto:alsa-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/alsa-devel>,
	<mailto:alsa-devel-request@lists.sourceforge.net?subject=subscribe>
List-Archive: <http://sourceforge.net/mailarchive/forum.php?forum=alsa-devel>
To: Raymond <rayau@netvigator.com>
Cc: alsa-devel@lists.sourceforge.net
List-Id: alsa-devel@alsa-project.org

On Sat, 2005-08-20 at 15:17 +0800, Raymond wrote:
> ./configure: line 4415: syntax error near unexpected token `<<<'
> ./configure: line 4415: `<<<<<<< configure.in' 

This indicates a CVS merge conflict.  Try a fresh checkout.

Lee



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf