[gridengine/f15] Cleanup cherrypick

[Orion Poplawski]

commit 7ff9b79116503b7b3367b3dfd0fc1e99b3d58692
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Apr 17 11:24:57 2012 -0600

    Cleanup cherrypick

 gridengine.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/gridengine.spec b/gridengine.spec
index 65a6756..bb5c5d4 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -595,7 +595,6 @@ fi
 
 
 %changelog
-<<<<<<< HEAD
 * Tue Apr 17 2012 Orion Poplawski <orion at cora.nwra.com> 6.2u5-10.4
 - Set _hardened_build
 - Add two more upstream security patches