diff options
Diffstat (limited to 'src/cert/x509/x509path.h')
| -rw-r--r-- | src/cert/x509/x509path.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/cert/x509/x509path.h b/src/cert/x509/x509path.h index fc784d429..18129a236 100644 --- a/src/cert/x509/x509path.h +++ b/src/cert/x509/x509path.h @@ -10,12 +10,7 @@ #include <botan/x509cert.h> #include <botan/certstor.h> -<<<<<<< variant A #include <set> ->>>>>>> variant B -#include <functional> -####### Ancestor -======= end namespace Botan { |