[kernel/f14/user/steved/pnfs-f14: 100/106] - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24

[Steve Dickson]

commit 2f1b6218c2ec199b456bead272bd8f4d54431556
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Aug 31 21:17:17 2010 -0400

    - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 kernel.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 0b10bea..f9be2fe 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2668,12 +2668,9 @@ fi
    mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
 * Thu Aug 19 2010 Steve Dickson <steved at redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
-<<<<<<< HEAD
 
 * Thu Aug 19 2010 Steve Dickson <steved at redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
-=======
->>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
 
 * Wed Aug 18 2010 Dave Jones <davej at redhat.com>
 - systemd is dependant upon autofs, so build it in instead of modular.