diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2010-06-30 07:43:49 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2010-06-30 07:43:49 +0000 |
| commit | b18d4185b18646e4f94c8a61308451deb7f4f94b (patch) | |
| tree | e7a597a7f375b4e30f8c7206d05f49e4aab255bc /lib | |
| parent | b4a42e4d51ecb58bcb643faa0a9dc54d160e7db8 (diff) | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpmc/pmc.tsc.3 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/libpmc/pmc.tsc.3 b/lib/libpmc/pmc.tsc.3 index c192db3ed9f0..3dd0b8859caa 100644 --- a/lib/libpmc/pmc.tsc.3 +++ b/lib/libpmc/pmc.tsc.3 @@ -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 , |