From b195249a0fc2445d6a06d534cd7d22cd3dc27402 Mon Sep 17 00:00:00 2001
From: Jack Lloyd <lloyd@randombit.net>
Date: Thu, 20 Oct 2016 21:16:08 -0400
Subject: Cleanup from rebase

---
 src/lib/kdf/kdf.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/lib/kdf')

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
    };
 
 /**
-- 
cgit v1.2.3