diff options
Diffstat (limited to 'src/libstrongswan/asn1/asn1.h')
| -rw-r--r-- | src/libstrongswan/asn1/asn1.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstrongswan/asn1/asn1.h b/src/libstrongswan/asn1/asn1.h index 70411c999..05a060827 100644 --- a/src/libstrongswan/asn1/asn1.h +++ b/src/libstrongswan/asn1/asn1.h @@ -115,8 +115,6 @@ int asn1_known_oid(chunk_t object); chunk_t asn1_build_known_oid(int n); /** -<<<<<<< HEAD -======= * Convert human readable OID to ASN.1 DER encoding, without OID header. * * @param str OID string (e.g. 1.2.345.67.8) @@ -133,7 +131,6 @@ chunk_t asn1_oid_from_string(char *str); char* asn1_oid_to_string(chunk_t oid); /** ->>>>>>> upstream/4.5.1 * Returns the length of an ASN.1 object * The blob pointer is advanced past the tag length fields * |