[gdl/el6] Finish up conflit cleanup

[Orion Poplawski]

commit e50e6620329e94cf57d9192d3ef463cdc9bb8102
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue May 15 22:24:14 2012 -0600

    Finish up conflit cleanup

 gdl.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/gdl.spec b/gdl.spec
index 717b097..7a31db8 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -2,11 +2,7 @@
 
 Name:           gdl
 Version:        0.9.2
-<<<<<<< HEAD
-Release:        3%{?dist}.1
-=======
 Release:        6.cvs20120515%{?dist}
->>>>>>> master
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering