diff options
| author | Ronan Le Martret <ronan@fridu.net> | 2014-03-13 09:30:50 +0100 |
|---|---|---|
| committer | Ronan Le Martret <ronan@fridu.net> | 2014-03-19 13:53:50 +0100 |
| commit | eca51647731d77002f23caaf55388800af745f45 (patch) | |
| tree | 9266786df0e2821cb16b4cefc6685e4fcccf93c0 | |
| parent | eca4ad076b25d485f55795e6200316870a0b0906 (diff) | |
| download | openssl-accepted/tizen_ivi_panda.tar.gz openssl-accepted/tizen_ivi_panda.tar.bz2 openssl-accepted/tizen_ivi_panda.zip | |
Remove merge conflict.submit/tizen_ivi_panda/20140403.012046submit/tizen/20140328.195232accepted/tizen/ivi/panda/20140403.014240accepted/tizen/ivi/panda/20140329.032018accepted/tizen/generic/20140331.081816tizen_ivi_pandaaccepted/tizen_ivi_panda
Change-Id: I77c4fa8b8636ad088c42fb345e4b969c3500a19a
Signed-off-by: Ronan Le Martret <ronan@fridu.net>
| -rw-r--r-- | crypto/bn/asm/x86_64-gf2m.pl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/bn/asm/x86_64-gf2m.pl b/crypto/bn/asm/x86_64-gf2m.pl index c08dcd0..226c66c 100644 --- a/crypto/bn/asm/x86_64-gf2m.pl +++ b/crypto/bn/asm/x86_64-gf2m.pl @@ -31,12 +31,8 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1; ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or die "can't locate x86_64-xlate.pl"; -<<<<<<< HEAD open OUT,"| \"$^X\" $xlate $flavour $output"; *STDOUT=*OUT; -======= -open STDOUT,"| \"$^X\" $xlate $flavour $output"; ->>>>>>> ecbc968bbf2ed3b1d1fb9cb3576a53c7ae52a0b4 ($lo,$hi)=("%rax","%rdx"); $a=$lo; ($i0,$i1)=("%rsi","%rdi"); |