svn commit: r209606 - stable/7/lib/libpmc
David E. O'Brien
obrien at FreeBSD.org
Wed Jun 30 07:43:49 UTC 2010
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 ,
More information about the svn-src-stable-7
mailing list