diff options
Diffstat (limited to 'src/libcharon/encoding/payloads/cert_payload.h')
| -rw-r--r-- | src/libcharon/encoding/payloads/cert_payload.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libcharon/encoding/payloads/cert_payload.h b/src/libcharon/encoding/payloads/cert_payload.h index 74d2b3cd2..21b503a40 100644 --- a/src/libcharon/encoding/payloads/cert_payload.h +++ b/src/libcharon/encoding/payloads/cert_payload.h @@ -134,8 +134,6 @@ cert_payload_t *cert_payload_create_from_cert(certificate_t *cert); */ cert_payload_t *cert_payload_create_from_hash_and_url(chunk_t hash, char *url); -<<<<<<< HEAD -======= /** * Creates a custom certificate payload using type and associated data. * @@ -145,5 +143,4 @@ cert_payload_t *cert_payload_create_from_hash_and_url(chunk_t hash, char *url); */ cert_payload_t *cert_payload_create_custom(cert_encoding_t type, chunk_t data); ->>>>>>> upstream/4.5.1 #endif /** CERT_PAYLOAD_H_ @}*/ |