[pcp/el6] Update to latest community sources

[Mark Goodwin]

commit 14a63eaef4857ac7d4a0b02e33f751e525882430
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Wed Jul 16 14:06:18 2014 +1000

    Update to latest community sources

 pcp.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/pcp.spec b/pcp.spec
index 9a5d020..c5249b9 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -389,12 +389,9 @@ monitoring systems using live and archived Performance Co-Pilot
 #
 %package -n pcp-doc
 Group: Documentation
-<<<<<<< HEAD
-=======
 %if 0%{?rhel} == 0 || 0%{?rhel} > 5
 BuildArch: noarch
 %endif
->>>>>>> master
 Summary: Documentation and tutorial for the Performance Co-Pilot
 URL: http://www.performancecopilot.org