diff options
Diffstat (limited to 'src/lib/pubkey/xmss/xmss_index_registry.h')
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_index_registry.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/pubkey/xmss/xmss_index_registry.h b/src/lib/pubkey/xmss/xmss_index_registry.h index 3e5aaa794..8759ca03b 100644 --- a/src/lib/pubkey/xmss/xmss_index_registry.h +++ b/src/lib/pubkey/xmss/xmss_index_registry.h @@ -12,19 +12,12 @@ #include <cstddef> #include <limits> #include <memory> -<<<<<<< HEAD -======= -#include <mutex> ->>>>>>> 959425d... Added Extended Hash-Based Signatures (XMSS) #include <string> #include <botan/hash.h> #include <botan/secmem.h> #include <botan/types.h> #include <botan/atomic.h> -<<<<<<< HEAD #include <botan/mutex.h> -======= ->>>>>>> 959425d... Added Extended Hash-Based Signatures (XMSS) namespace Botan { |