[pcp/el5] fix .gitignore

[Mark Goodwin]

commit f90cfb767087e124bd1298f7e1d8255598c1c9be
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Mon Dec 12 20:11:56 2011 +1100

    fix .gitignore

 .gitignore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9239262..f8bff05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
 pcp-3.3.3-1.src.tar.gz
-<<<<<<< HEAD
-=======
 /pcp-3.5.0-1.src.tar.gz
 /pcp-3.5.11-1.src.tar.gz
->>>>>>> master