From owner-svn-src-all@FreeBSD.ORG  Wed Jun 30 07:43:49 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 65AA91065670;
	Wed, 30 Jun 2010 07:43:49 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 558708FC13;
	Wed, 30 Jun 2010 07:43:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5U7hngA078226;
	Wed, 30 Jun 2010 07:43:49 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5U7hnUF078224;
	Wed, 30 Jun 2010 07:43:49 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201006300743.o5U7hnUF078224@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 30 Jun 2010 07:43:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209606 - stable/7/lib/libpmc
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Jun 2010 07:43:49 -0000

Author: obrien
Date: Wed Jun 30 07:43:49 2010
New Revision: 209606
URL: http://svn.freebsd.org/changeset/base/209606

Log:
  Cleanup svn merge conflict markers.

Modified:
  stable/7/lib/libpmc/pmc.tsc.3

Modified: stable/7/lib/libpmc/pmc.tsc.3
==============================================================================
--- stable/7/lib/libpmc/pmc.tsc.3	Wed Jun 30 04:52:42 2010	(r209605)
+++ stable/7/lib/libpmc/pmc.tsc.3	Wed Jun 30 07:43:49 2010	(r209606)
@@ -59,13 +59,10 @@ The alias
 maps to the TSC.
 .Sh SEE ALSO
 .Xr pmc 3 ,
-<<<<<<< current:lib/libpmc/pmc.tsc.3
 .Xr pmc.atom 3 ,
 .Xr pmc.core 3 ,
 .Xr pmc.core2 3 ,
 .Xr pmc.iaf 3 ,
-=======
->>>>>>> patched:lib/libpmc/pmc.tsc.3
 .Xr pmc.k7 3 ,
 .Xr pmc.k8 3 ,
 .Xr pmc.p4 3 ,