diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kdf/kdf.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/kdf/kdf.h b/src/lib/kdf/kdf.h index ab793da87..15336a966 100644 --- a/src/lib/kdf/kdf.h +++ b/src/lib/kdf/kdf.h @@ -182,11 +182,6 @@ class BOTAN_DLL KDF * @return new object representing the same algorithm as *this */ virtual KDF* clone() const = 0; -<<<<<<< HEAD - - typedef SCAN_Name Spec; -======= ->>>>>>> 8978841... Remove Algo_Registry }; /** |