diff options
| author | Jack Lloyd <[email protected]> | 2016-10-20 21:16:08 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-10-21 16:53:18 -0400 |
| commit | b195249a0fc2445d6a06d534cd7d22cd3dc27402 (patch) | |
| tree | 735a6f5549eb3ac8b2e754e8fa54f176a7930da5 /src/lib/kdf/kdf.h | |
| parent | a2d604c4f3ba2127d364ed0d776f0ce236c69c87 (diff) | |
Cleanup from rebase
Diffstat (limited to 'src/lib/kdf/kdf.h')
| -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 }; /** |