From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 21 07:56:38 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C7658A95;
 Wed, 21 Nov 2012 07:56:38 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ADAAE8FC15;
 Wed, 21 Nov 2012 07:56:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAL7ucqS099489;
 Wed, 21 Nov 2012 07:56:38 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAL7ucdi099488;
 Wed, 21 Nov 2012 07:56:38 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201211210756.qAL7ucdi099488@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 21 Nov 2012 07:56:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243369 - projects/portbuild/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Nov 2012 07:56:38 -0000

Author: linimon (doc,ports committer)
Date: Wed Nov 21 07:56:38 2012
New Revision: 243369
URL: http://svnweb.freebsd.org/changeset/base/243369

Log:
  Fix mismerge.

Modified:
  projects/portbuild/conf/server.conf

Modified: projects/portbuild/conf/server.conf
==============================================================================
--- projects/portbuild/conf/server.conf	Wed Nov 21 07:55:22 2012	(r243368)
+++ projects/portbuild/conf/server.conf	Wed Nov 21 07:56:38 2012	(r243369)
@@ -105,7 +105,7 @@ MASTER_URL="pointyhat.freebsd.org"
 # vcs-specific definitions
 #
 
-VCS="svn"
+VCS="SVN"
 VCS_CHECKOUT_COMMAND="svn checkout"
 VCS_UPDATE_COMMAND="svn update"