diff options
| author | Werner Koch <wk@gnupg.org> | 2003-07-18 13:45:21 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2003-07-18 13:45:21 +0000 |
| commit | 8ddfcd51c697ff61c1987d7264528a46745312ab (patch) | |
| tree | 8a555b663ab1a8331fb5a12a5d6ad386c44b4849 /cipher | |
| parent | fc6d19d9f78bbecac31d293d647201c511fdfa56 (diff) | |
| download | libgcrypt-8ddfcd51c697ff61c1987d7264528a46745312ab.tar.gz | |
Forgot to fix the conflict here.
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/md.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cipher/md.c b/cipher/md.c index 670de923..461fe9a8 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -1183,17 +1183,6 @@ gcry_md_is_enabled (gcry_md_hd_t a, int algo) value = 0; return value; } -<<<<<<< md.c - - - - - - - - - -======= /* Get a list consisting of the IDs of the loaded message digest modules. If LIST is zero, write the number of loaded message @@ -1213,4 +1202,3 @@ gcry_md_list (int *list, int *list_length) return err; } ->>>>>>> 1.73 |