[v8/el6] really fix merge conflict

[T.C. Hollingsworth]

commit cf43128df7c56ae828c21e69733f438a89f814e5
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Fri May 2 18:06:50 2014 -0700

    really fix merge conflict
    
    CTRL+S is a thing one should do before commiting...

 v8.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/v8.spec b/v8.spec
index 074ff7e..1819a6d 100644
--- a/v8.spec
+++ b/v8.spec
@@ -92,11 +92,7 @@ Development headers and libraries for v8.
 %endif
 
 # -fno-strict-aliasing is needed with gcc 4.4 to get past some ugly code
-<<<<<<< HEAD
-PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing -Wno-unused-parameter -Wno-error=strict-overflow -Wno-unused-but-set-variable\'| sed "s/ /',/g" | sed "s/',/', '/g"`
-=======
 PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS %{lrt} -fPIC -fno-strict-aliasing -Wno-unused-parameter -Wno-error=strict-overflow -Wno-error=unused-local-typedefs -Wno-unused-but-set-variable\'| sed "s/ /',/g" | sed "s/',/', '/g"`
->>>>>>> master
 sed -i "s|'-O3',|$PARSED_OPT_FLAGS,|g" SConstruct
 
 # clear spurious executable bits