diff options
Diffstat (limited to 'src/lib/pubkey/xmss/xmss_tools.h')
| -rw-r--r-- | src/lib/pubkey/xmss/xmss_tools.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/pubkey/xmss/xmss_tools.h b/src/lib/pubkey/xmss/xmss_tools.h index ab60665c7..a62f17ebf 100644 --- a/src/lib/pubkey/xmss/xmss_tools.h +++ b/src/lib/pubkey/xmss/xmss_tools.h @@ -11,10 +11,7 @@ #include <stdint.h> #include <iterator> #include <type_traits> -<<<<<<< HEAD #include <botan/cpuid.h> -======= ->>>>>>> 959425d... Added Extended Hash-Based Signatures (XMSS) #include <botan/types.h> #include <botan/secmem.h> |