[ca-certificates/f21] Remove merge conflict

[Peter Lemenkov]

commit bba934e680cc9b86a75fd5b58a3d0ca1dbdb0b84
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Nov 14 18:53:24 2014 +0300

    Remove merge conflict
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 ca-certificates.spec |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/ca-certificates.spec b/ca-certificates.spec
index 46c6de5..8de2602 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -155,7 +155,6 @@ EOF
       echo "legacy enable flags $targs for $f" >> info.trust
       openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >> %{legacy_enable_bundle}
    fi
-<<<<<<< HEAD
  done
 
  for f in certs/legacy-disable/*.crt; do 
@@ -174,26 +173,6 @@ EOF
    fi
  done
 
-=======
- done
-
- for f in certs/legacy-disable/*.crt; do 
-   echo "processing $f"
-   tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f`
-   alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' $f | sed "s/'//g" | sed 's/"//g'`
-   targs=""
-   if [ -n "$tbits" ]; then
-      for t in $tbits; do
-         targs="${targs} -addtrust $t"
-      done
-   fi
-   if [ -n "$targs" ]; then
-      echo "legacy disable flags $targs for $f" >> info.trust
-      openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >> %{legacy_disable_bundle}
-   fi
- done
-
->>>>>>> master
  P11FILES=`find certs -name *.p11-kit | wc -l`
  if [ $P11FILES -ne 0 ]; then
    for p in certs/*.p11-kit; do