From owner-freebsd-current@FreeBSD.ORG  Mon May  4 14:49:48 2015
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E8D8EB6;
 Mon,  4 May 2015 14:49:47 +0000 (UTC)
Received: from mail-lb0-x236.google.com (mail-lb0-x236.google.com
 [IPv6:2a00:1450:4010:c04::236])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 89AEA17DD;
 Mon,  4 May 2015 14:49:47 +0000 (UTC)
Received: by lbbqq2 with SMTP id qq2so106479540lbb.3;
 Mon, 04 May 2015 07:49:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=Vmh3LHoLz7jMvHfdCXOHZOc38F1Q30KlMNzfkt3pYOU=;
 b=uJni1/bi0b7OLjBy2sZddTp5e8r5qnl1DaO3nrRaNfmK1+d2PSvdZoOj4zUGgU5p2y
 IIHhlz2BpCW1njJ4N3xDDO8GyLuiGO3V36uD8Q0dSLJcYAJ989S957/58UsQOAGv5nym
 FS46bGU74a06TK+Xtb1Bp0Fwd7lBPCUQTogxdE4LXdr9DzSuiIHfvHU+1WVSJqAZXUFt
 SCW6RrT9jePmN46lWCwv/ME9YJiRfCNafcGPzWs2zPUCADhYKDvLZsI0ENmK2zyx515y
 YkiFwtJYNfKnp0Z50SyTDC3vVQm48TVZaQ4eJFd4ZJ+nmy/AA6oUTLF5HNtbpO3ZxE2t
 wiZg==
MIME-Version: 1.0
X-Received: by 10.152.170.170 with SMTP id an10mr19781214lac.84.1430750985240; 
 Mon, 04 May 2015 07:49:45 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.164.38 with HTTP; Mon, 4 May 2015 07:49:45 -0700 (PDT)
In-Reply-To: <201505041326.t44DQH1E046967@slippy.cwsent.com>
References: <861766483.4.1430730824975.JavaMail.jenkins@jenkins-9.freebsd.org>
 <201505041326.t44DQH1E046967@slippy.cwsent.com>
Date: Mon, 4 May 2015 10:49:45 -0400
X-Google-Sender-Auth: u3KBU1RAC7NAXzL4ZTQbDdLRR2g
Message-ID: <CAG=rPVf8a1h+BeKbmd_JDQLve78iyqwAua3kL1SCD=i0eOnuSA@mail.gmail.com>
Subject: Build failed in Jenkins: FreeBSD_HEAD #2725
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: Cy Schubert <Cy.Schubert@komquats.com>
Cc: "jenkins-admin@freebsd.org" <jenkins-admin@freebsd.org>, 
 "freebsd-current@freebsd.org" <freebsd-current@freebsd.org>,
 "neel@freebsd.org" <neel@freebsd.org>, "cy@freebsd.org" <cy@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 May 2015 14:49:48 -0000

On Monday, May 4, 2015, Cy Schubert <Cy.Schubert@komquats.com
<javascript:_e(%7B%7D,'cvml','Cy.Schubert@komquats.com');>> wrote:
>
>
> I cannot see where the problem is. All local tests, including universe,
> have built cleanly.
>

 In this log: https://jenkins.freebsd.org/job/FreeBSD_HEAD/2725/console
search for:

error: version control conflict marker in file


--

Craig